cleanup/reorder