FindBugs fix - fixed "Should be a static inner class" - see http://findbugs.sourceforge.net/bugDescriptions.html#SIC_INNER_SHOULD_BE_STATIC