Fixed PMD violations
Merge branch 'master' of https://github.com/groggi/eth-jcd