Some simplifications



(next)