code cleanup
doc cleanup