Build cleanup & checkstyle

Needless reformat.