Simplify a bit more