Some simplifications to quickstep