PMD, CheckStyle and FindBugs fixes