Thanks Patrice - I leave the water in my iron too, so can't wait to switch.
My Mom & StepDad were both smokers (not me tho'), but the house & cars never seemed to smell like cigarettes to me, so I asked Mom once - she said that she would take a towel/rag soaked in vinegar & wipe everything down with it - walls, upholstery & all.
Vinegar truly is an amazing thing!