initial tidy up of links