Is there a better product? It seems to work, but maybe it's not neutralizing the odors well enough.

He usually sleeps upstairs in our bedroom, but the pee is always downstairs. We have a living room, family room, kitchen, and small 'bonus room' downstairs. He has peed in every room down there, although the living room and kitchen only once each. The bonus room and family room are his favorites. He lifts his leg to the couch in the family room the most.

I don't limit his water intake - I thought about that but have no idea how to do it. I usually try to keep it pretty full. How would I go about limiting it?