Refactored box move