Code Standards Part 2

At long last Part 2 of my coding standards mission

See part 1: #6157