Commit refactoring