Clean up some phpcs stuff