Removed unneeded variables and fixed some comments
Merge pull request #2 from pyrohail/master

Removed unneeded if statements and fixed some comments