just a little code reorg