Findbugs and Checkstyle enhancements
Major clean-up of checkstyle and findbugs issues.