Refactor move