some minor clean-up