TrappingRainWater minor code clean