tightening usings
Merge pull request #65 from glennblock/dev

tightening usings