Some Checkstyle stuff

First of many to come