Little clean-up