Build cleanup & checkstyle

This whole file is unnecessarily reformatted