Readability improvements
Merge pull request #4 from moshekaplan/patch-1

Readability improvements