refactor scoping
Merge pull request #38 from jlambert121/refactor

refactor scoping