simplify a little bit