Commit refactoring v2