Got rid of all the findBugs