bit of clean-up