Build cleanup & checkstyle

Still with the stars