PSR2 fixes

Minor changes. Just testing the waters a bit here... :)