Rearranged code after merging

Reordered & cleaned up some code relating to the merged startDelay feature.