Further polishing of documentation after comments