little bit of clean up
more clean up