clean-up a little