remove some brainfarts and ambiguousities