RainEffect cleaned up