Refactoring of the regular declensions part