Made overwrite and before_update clean

I cannot make it cleaner