Clear up all checkstyle issues