Whitespace.
Untabify/whitespace.
Whitespace and naming consistency.
Untabify/whitespace.
Remove some code duplication.
Don't need this commented code sitting around.