Build cleanup & checkstyle

Don't modify this spacing