fix various checkstyle issues