Simplification
Update for #8