phpcs and phpmd fixes