Some minor clean-up