Fix missing string and simplify