Shuffle
Clearer names
Less code
Bump deps
Merge pull request #34 from tschaub/touchups

Minor code shuffle.  Updated dependencies.