Reorganize waterer a bit