Refactored Cell Moving