remove 4 potential bugs findBugs