some simplifications
more simplifications