Checkstyle & stuff

:dog2: :dog2: