Ran PHP CS fixer.  Tidied up some non-PSR2 code.