refactor raindrops