chg: minor cleanup