Checkstyle & stuff

See answer above.