shurly-9 Code Cleanliness Sweep
Added checkstyle to IDE locally for now.