Refactor all the variables.

Helps to use the right ones...