HOPKINS: More refactoring in Hopkins (Thanks fuzzie for the help)