Changes for consistency on vars
Tidy