PHPCS cleanup. Still a lot of errors but can't be helped.