Cleaned up local variables
Merge pull request #17 from tricknotes/cleanup

Cleaned up local variables