Refactoring et integration bloc hypo