Implement FindBugs suggestions