Formatted the new code a bit better.

Replaced a bogus var name too.