Clean code for a coming release
Clean code for save event