refactored vars