Made a refactoring.