Watering refactoring