Refectoring afert PHPMD Report!