bit of clean up