Update DataSort

Changed to switch instead of new method.
Stopped using a global scanner (for now).
Took out the timer (for now).
Cleaned up program.