Change sort representation to class (do not review yet)

Testing...
Yeah, will do. Thanks for the suggestion. I was going to leave it as the last step.