refactoring: make findbugs work harder