water: review and cleanup documentation