Code Cleanups for 2.2

Another burst on the coding standards cleanup