move refactoring