Build cleanup & checkstyle

No, I'm not.  This change has nothing to do with checkstyle and just adds even more noise than is needed.  There's no reason to let any needless reformatting go in - it just causes problems down the line.