Tidy up and more on talk