FindBugs refactoring