refactoring: findbugs cleanups