more clean up and docs