PSR-1 + PSR-2 fixes

Some PSR-1+PSR-2/codingstyle fixes