Refactor hostvars