Build cleanup & checkstyle

Spacing changes not needed here