HOPKINS: Refactoring in ComputerManager