Add missing string and cleanup