reordering, cleanup