findbugs suggested improvements