cleaned up some issues reported by FindBugs