changes based on the output of FindBugs