dsyer Re-order while loop a bit