Editing clean up of first version