fixed FindBugs and PMD messages