Cleanup: coding style fixes
The pattern now expects more arguments