Tidy up and timestamps