Tweak per awesome feedback from @steveklabnik