Get rid of some stuttering in comments and docs