minor code cleanup
Merge pull request #29 from dschaffe/cleanup

minor code cleanup