[refactor] update following @rauschma's comments

See also https://twitter.com/rauschma/status/395301555592634368