refactored water basic report
tidied up loose ends for refactor