Quicksort, cleanup of variable names