refactored: variable names