refactoring: more findbugs cleanup