Did the refactoring