Refactoring of the V declensions part