Checkstyle & stuff

Fixd