some more simplifications