Partial refactoring of declarations 3