Some cleanup
Also playing around with checkstyle, pmd, findbugs