Did refactoring