Refactor move method