Used puppet-lint --fix
Moved subclasses to separate files. Made lint pass