Fixes to phpcs & phpmd violoations.