Clean up (used FindBugs and PMD on the code).