Refactor move methods