further refactor of Location and LocationDayQuantity models.