Resolve phpcs and phpmd issues