refactoring again movement