Refactoring Move method