More cleanup.  Ran intellij inspections and corrected some of the issues that were discovered.