Address Ben's feedback from PR #100
address Tobias' comments
Merge pull request #105 from cockroachdb/spencerkimball/address-bens-comments

Address Ben's feedback from PR #100