light refactoring of order save