Some simplifications.