Improve sorting buttons implementation design. Moving off a switch statement for sorting case.