cleanup + quicksort added