Some simplifications to the sprinkler controller