refactoring: findbugs issues