HOPKINS: Some more refactoring