refactor some order sending pieces