Refactored -  vars