cleanings

- CHG: minor cleanings