refactoring: findbugs cleanup