HOPKINS: Some refactoring in GraphicsManager