PSR-2 standards fixes