little more clean-up