Formatting updates for PSR-1 and PSR-2

Ran php-cs-fixer on things.