bit of clean up
clean up