cleaned up FindBugs ran and no bugs found, also refactored