some more minor clean-up