Minor cleanups
Merge pull request #90 from tribal-tec/master

Minor cleanups