Simplify a little bit