Simplifying.
Various changes.