various checkstyle fixes