Refactor less copy