a bit more clean-up