a little bit clean-up