Some simplifications, and reorganizing.