Minor code style consistency changes

Minor stuff for my OCD