Bit of clean-up.