Refactored variable names