cleanup and checkstyle fixes