Simplify yet more