Minor cleanup
Merge pull request #340 from tribal-tec/master

Minor cleanup