just a bit of clean up