refactored variable names