PSR-2 CS Fixes

Some CS Fixes