Fixes based on nex3's feedback.

Rename a few variables.
Remove variable initialization code