Simplification and small changes.