clean up ordering