Better water generation

Shortened the water generation code