Commit to refactor