function reorg

grouping static functions together...