refactoring movement