Code refactoring & small change to one of the variable declarations.
Merge pull request #4 from matt-major/master

Code refactoring & small change to one of the variable declarations.