minor clean-up changes