bit of clean up.