Editing changes and simplification.