Cleanup all code for consistency, and clarity.

Seems like an unnecessary variable declaration if it is not being used more than once. I'd like the previous syntax restored.