Minor readability improvements
Merge pull request #19 from pklaus/readability-cleanup

Minor readability improvements in the source code