Some refactoring of the fragility_model (propedeutic to future work)