~ minor clean-up