Build cleanup & checkstyle