DOC: Address @gregcaporaso's suggestions
STY/ENH: Address @wasade's comments