HOPKINS: Some refactoring in ComputerManager