Post partial refactoring