more reorg, but narrowing down on good style now I think