Build cleanup & checkstyle

Same here