More simplifying