Refactor
Event - Da verificare unit-test