PHPMD fixes and remove Style\Tabs (not needed)