code reorg / clean-up