refactor internals for improved readability
Merge pull request #22 from SurveyMonkey/refactor

refactor internals for improved readability