Build cleanup & checkstyle

No, this is not XML, it's HTML