Refactor changeset