Code cleanup

Altered some variable names and comments. Removed some redundant parentheses.