Last tidy up done