Master fix findbugs warning

Use static nested class rather than a nested class, since the nested class does not need access to any of the nesting class instance methods or fields.

Also fixes a new findbugs warning.