Clean up for FindBugs