Simplify a bit