Refactoring.
Addition refactoring.