Refactor raindrop