Updated refactoring.
Updated refactoring.