Checkstyle & stuff

As above.