refactor scoping
Merge pull request #13 from jlambert121/refactor

refactor scoping