Cleans up ordering