syntax + doc cleanup.