Final CS Fixes

This should be the rest of the eof new line and whitespace fixes. All the files on the 4.1 branch after this should be compliant.