Refactoring after two years