bunch of clean up