Eliminated FindBugs warnings