Clean up and fix Merge Sort