Tidy up and timing