HOPKINS: More refactoring in AnimationManager and ComputerManager