Added quicksort, cleaned up methods