Movement.cs code refactoring