tMinor refactoring
Merge pull request #24 from triplem/upstream

Minor refactoring