a bit of clean up
cleanup and docs