Code cleanup

Altered some variable names and comments. Removed some redundant parentheses.
Merge pull request #315 from tadatada/patch-1

Cheat code cleanup