Merge "Fix some stuttering in comments and documentation"