fixup! spaces, reorg