Refactored vars.
Refactored vars