Some cleanups to style/tests for your consideration
Merge pull request #4 from gnarf/pr/9854

Thanks for the refactoring about the settings. Looks good to me.