HOPKINS: More refactoring on PARCOURS2