chg: clean up and editing