Minor code cleanup
Merge pull request #135 from peastman/master

Minor code cleanup