commit refactor