simplify some more