Some slight code cleanup
Merge pull request #20 from isuftin/master

Some slight code cleanup