Some readability improvements
Merge pull request #16 from chicoxyzzy/patch-1

Some readability improvements