Improve copy and clean