Refactoring move method