Address doc comments from @astrofrog