Refactor Movement class