Refactored variable references