some more cleanup and checkstyles