continue to tidy up