Refactored param and variable names