ordering, cleanup