even more cleanup, documentation, formatting and checkstyle fixes