ENH addressed some of @arjoly's suggestions