Simplify some more