findbug fixes to better coding style