cleaning up ordering