Simplifcation for common sorting options + other demo simplifications