A lot of simplifications