minor clean-up done