Refactor Commit