Build cleanup & checkstyle

Don't change this kind of spacing either