Use a enum (ClassType) instead of a magic string
Minor tidy up