more findbugs cleanup