Partial refactoring of declarations 6