minor clean-up, notes