more tab cleanups