Refactoring of the M declensions part