Cleanup: Remove unused parameter
Cleanup: Rename parameter to increase readability