Fix class name to be psr compliant else the migration will fail to find the class
Formatting, styling and indenting fixes. No bug fixes.