Refactor and tidy up
Use the copier we already have