Tidy up copy a little