HOPKINS: Some refactoring in DialogManager and AnimationManager