making some simplifications