Bernie is right, the more water you drink, the more diluted your urine will be,. The more cincentrated it is, the stronger the smell. Pop and such will not work as well to dilute your urine, so keep that in mind.
It will never smell great, but you can at least minimize the scent.
And...