Clean up copy preparation a bit