Fix javadoc warning (@todo is an unknown tag)
Fixed PMD and FindBugs warnings