Commit refactoring.
Commit refactoring.