Cleaning up some timing stuff