Bit of clean-up