A giant code clean-up, using PMD guidelines.