Merge: modelize_class: Refactor