Simplify a few things