Formatting.
Some simplifications.