Coding Style fixes to PSR-2 (via PHP-CS-Fixer)