CS Fixes

4 spaces for indentation, no trailing whitespace, and files end with a single new line.