Simplify expression now applied everywhere

Hopefully