cleaned FindBugs warnings