Cleaning up variables
Merge pull request #4 from thejamesdempsey/vars

Cleaning up variables