tidy up and link up