Ran all this through php-cs-fixer