ok, a little more reorg and cleanup