Refactor after code review.
Docstring
Merge pull request #1 from travisfischer/master

Refactor based on code review with team