tidy up timing