Small reordering of code to be more like real-world use