Refactored loop variable names