doc cleanup and comment removal.