A bit of clean-up