Vars refactored