Can move refactoring.