Partial refactoring of declarations 2