PSR2 Fixes for ClassDefinition