Clean-up of SaveChanges method