More PHPCS cleanup, some PHPMD cleanup