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