Minor code simplification
Merge pull request #45 from sol/cleanup

Minor code simplification