code and doc cleanup