cleaned up ordering