Build cleanup & checkstyle

Spacing