more tab cleanup