Rename variables + remove function contract / signature

Right! Tq