Minimal refactoring
Removed unused parameter