First pass at tidying up paced timing functions