cosmetic updates v2

This is like the previous pull request, without removing the "pointless comments."