Tidying up some code detected by FindBugs