Checkstyle & stuff

and fix indents