Rename variables + remove function contract / signature

It's more compact/readable like that