Renaming of variables for clarity.

Renaming of variables for clarity, and line formatting.