Fix (nearly) all left over codestyle issues

Weird... why didn't these show up when I ran phpcs locally ?