Build cleanup & checkstyle

Don't change this spacing