Removed PHPMD suppression by resolving issue
Removed PHPMD suppression
Changed priority of Unused variables