cleanup, reorder