Tidy up some variables
Merge pull request #68 from dreamteam69/master

Tidy up some variables