Sync comment and code

The first commit fixes some inconsistency between code and comment

The second commit aligns whitespace.