Refactor Move