Refactor droplet initialization