Use save by and update by methods
Remove additional new line