Simplification

From C-7KDB897