Moved some control variable assignments to improved clarity
Moved some control variable assignments to improved clarity