Removed uncalled dead code.
Minor formatting to push the var out to the scope that it is actually in.
Merge pull request #164 from Adron/test

Removed Dead Code