clean code by adding BeforeSave and After Find
Final version before go live