Minor changes to doc and comments as per suggestions in PR review