more simplifications