checkstyle, cleanup