Build cleanup & checkstyle

Readability actively destroyed here