Further cleanup of the doc