minor clean-ups