+ Signals BeforeDelete and BeforeSave
>> Refactor