HOPKINS: Minor refactoring in GraphicManager