refactor to be more idiomatic
Merge pull request #2 from gorsuch/gorsuch/refactor

Refactor to be more idiomatic