Build cleanup & checkstyle

And here