Did refactoring.