small reorg of utils module