Refactored out movement