a little reorg
linted