Refactoring of module cure