PSR-2 standards fixes
PSR-2 standards fixes