Tuned Checkstyle
Merge branch 'checkstyle' into gradle