Code review feedback:
- Make arg names more obvious