Refactored parameter names
Refactoring