reorg, update, and simplify