Clean up SetSort a bit more