Code cleanup and checkstyle.