Partial refactoring of declarations 4