Simplify a little more