more sonar cleanup, focusing on findbugs issues