Build cleanup & checkstyle

@dmlloyd see this