tidy up and recreate