Commit refactoring.