Fixed sorting to non-generic, removed some useless Client Code