#24: Clean up some code for findbugs checks