Improvements according to PMD tool results.
Merge branch 'master' of https://github.com/ALIADA/aliada-tool.git