Partial refactoring of declarations 5