Performed refactoring.