IMPROVED : QA (PHPMD)