clean-up a bit