Fixing PHPMD recomendations