- refactored var