Move refactor