Repository: PolicyEngine/policyengine-uk (language: python)

Issue:
Consistently punctuate descriptions
Some have periods, some don't:
![image](https://user-images.githubusercontent.com/6076111/144359837-0261b903-d752-4aa7-a1db-eab6c48c4577.png)
![image](https://user-images.githubusercontent.com/6076111/144359845-71639056-5d0d-4f80-8622-a60489310e65.png)

I'd favor no period, since these should be just a sentence as we're showing them here in PolicyEngine


Discussion / hints:

Fix patch:
diff --git a/openfisca_uk/parameters/benefit/DLA/mobility/higher.yaml b/openfisca_uk/parameters/benefit/DLA/mobility/higher.yaml
index 9d87c63b2..315166817 100644
--- a/openfisca_uk/parameters/benefit/DLA/mobility/higher.yaml
+++ b/openfisca_uk/parameters/benefit/DLA/mobility/higher.yaml
@@ -1,7 +1,6 @@
-description: Lower rate of the mobility component of DLA
+description: Lower rate of the mobility component of Disability Living Allowance
 values:
-  2015-06-04:
-    value: 23.60
+  2015-06-04: 23.60
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/dla-disability-living-allowance-benefit/DLA-rates
diff --git a/openfisca_uk/parameters/benefit/DLA/mobility/lower.yaml b/openfisca_uk/parameters/benefit/DLA/mobility/lower.yaml
index f38754354..c0691d17a 100644
--- a/openfisca_uk/parameters/benefit/DLA/mobility/lower.yaml
+++ b/openfisca_uk/parameters/benefit/DLA/mobility/lower.yaml
@@ -1,7 +1,6 @@
-description: Higher rate of the mobility component of DLA
+description: Higher rate of the mobility component of Disability Living Allowance
 values:
-  2015-06-04:
-    value: 62.25
+  2015-06-04: 62.25
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/dla-disability-living-allowance-benefit/DLA-rates
diff --git a/openfisca_uk/parameters/benefit/DLA/self_care/highest.yaml b/openfisca_uk/parameters/benefit/DLA/self_care/highest.yaml
index 545c795cf..720ce5a57 100644
--- a/openfisca_uk/parameters/benefit/DLA/self_care/highest.yaml
+++ b/openfisca_uk/parameters/benefit/DLA/self_care/highest.yaml
@@ -1,7 +1,6 @@
-description: Highest rate of the care component of DLA
+description: Highest rate of the care component of Disability Living Allowance
 values:
-  2015-06-04:
-    value: 89.15
+  2015-06-04: 89.15
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/dla-disability-living-allowance-benefit/DLA-rates
diff --git a/openfisca_uk/parameters/benefit/DLA/self_care/lowest.yaml b/openfisca_uk/parameters/benefit/DLA/self_care/lowest.yaml
index 4e21e1710..72c6f79c7 100644
--- a/openfisca_uk/parameters/benefit/DLA/self_care/lowest.yaml
+++ b/openfisca_uk/parameters/benefit/DLA/self_care/lowest.yaml
@@ -1,7 +1,6 @@
-description: Lowest rate of the care component of DLA
+description: Lowest rate of the care component of Disability Living Allowance
 values:
-  2015-06-04:
-    value: 23.60
+  2015-06-04: 23.60
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/dla-disability-living-allowance-benefit/DLA-rates
diff --git a/openfisca_uk/parameters/benefit/DLA/self_care/middle.yaml b/openfisca_uk/parameters/benefit/DLA/self_care/middle.yaml
index 1c98e6721..dd5b27280 100644
--- a/openfisca_uk/parameters/benefit/DLA/self_care/middle.yaml
+++ b/openfisca_uk/parameters/benefit/DLA/self_care/middle.yaml
@@ -1,7 +1,6 @@
-description: Middle rate of the care component of DLA
+description: Middle rate of the care component of Disability Living Allowance
 values:
-  2015-06-04:
-    value: 59.70
+  2015-06-04: 59.70
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/dla-disability-living-allowance-benefit/DLA-rates
diff --git a/openfisca_uk/parameters/benefit/ESA/income/amount_18_24.yaml b/openfisca_uk/parameters/benefit/ESA/income/amount_18_24.yaml
index bf41a27fc..ac5dfa192 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/amount_18_24.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/amount_18_24.yaml
@@ -1,9 +1,7 @@
-description: Income-based ESA personal allowance for persons aged 18-24
+description: Income-based Employment and Support Allowance personal allowance for persons aged 18-24
 values:
-  2015-06-01:
-    value: 57.90
-  2020-06-01:
-    value: 58.90
+  2015-06-01: 57.90
+  2020-06-01: 58.90
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/ESA/income/amount_over_25.yaml b/openfisca_uk/parameters/benefit/ESA/income/amount_over_25.yaml
index fabaf7a0a..cb9191915 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/amount_over_25.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/amount_over_25.yaml
@@ -1,9 +1,7 @@
-description: Income-based ESA personal allowance for persons aged over 25
+description: Income-based Employment and Support Allowance personal allowance for persons aged over 25
 values:
-  2015-06-01:
-    value: 73.10
-  2020-06-01:
-    value: 74.35
+  2015-06-01: 73.10
+  2020-06-01: 74.35
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/ESA/income/couple.yaml b/openfisca_uk/parameters/benefit/ESA/income/couple.yaml
index f1ea5d813..9f543e4d2 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/couple.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/couple.yaml
@@ -1,9 +1,7 @@
-description: Income-based ESA personal allowance for couples
+description: Income-based Employment and Support Allowance personal allowance for couples
 values:
-  2015-06-01:
-    value: 57.90
-  2020-06-01:
-    value: 116.80
+  2015-06-01: 57.90
+  2020-06-01: 116.80
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/ESA/income/earn_disregard.yaml b/openfisca_uk/parameters/benefit/ESA/income/earn_disregard.yaml
index d3325c88b..591aff185 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/earn_disregard.yaml
@@ -1,7 +1,6 @@
-description: Earnings threshold above which the income-based ESA amount is reduced
+description: Earnings threshold above which the income-based Employment and Support Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_couple.yaml
index d9e967ffc..a6378851d 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_couple.yaml
@@ -1,7 +1,6 @@
-description: Threshold for income for a couple, above which the income-based ESA amount is reduced
+description: Threshold for income for a couple, above which the income-based Employment and Support Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 10.00
+  2015-06-01: 10.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_lone_parent.yaml
index 369150e28..860dc377d 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_lone_parent.yaml
@@ -1,7 +1,6 @@
-description: Threshold for income for a lone parent, above which the income-based ESA amount is reduced
+description: Threshold for income for a lone parent, above which the income-based Employment and Support Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 20.00
+  2015-06-01: 20.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_single.yaml
index 0611196e8..73b7e592a 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_single.yaml
@@ -1,7 +1,6 @@
-description: Threshold for income for a single person, above which the income-based ESA amount is reduced
+description: Threshold for income for a single person, above which the income-based Employment and Support Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/ESA/income/pension_disregard.yaml b/openfisca_uk/parameters/benefit/ESA/income/pension_disregard.yaml
index d8d0a7a5a..113d7929f 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/pension_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/pension_disregard.yaml
@@ -1,7 +1,6 @@
-description: Threshold for occupational and personal pensions, above which the income-based ESA amount is reduced
+description: Threshold for occupational and personal pensions, above which the income-based Employment and Support Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 50.00
+  2015-06-01: 50.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/IIDB/maximum.yaml b/openfisca_uk/parameters/benefit/IIDB/maximum.yaml
index 2ac727300..19c9ffde8 100644
--- a/openfisca_uk/parameters/benefit/IIDB/maximum.yaml
+++ b/openfisca_uk/parameters/benefit/IIDB/maximum.yaml
@@ -1,7 +1,6 @@
-description: Maximum weekly Industrial Injuries Disablement Benefit. Amount varies in 10% increments.
+description: Maximum weekly Industrial Injuries Disablement Benefit; amount varies in 10% increments
 values:
-  2015-06-01:  # TODO: confirm start year.
-    value: 182
+  2015-06-01: 182
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/contrib/amount_18_24.yaml b/openfisca_uk/parameters/benefit/JSA/contrib/amount_18_24.yaml
index eb83d1984..41a0b3940 100644
--- a/openfisca_uk/parameters/benefit/JSA/contrib/amount_18_24.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/contrib/amount_18_24.yaml
@@ -1,9 +1,7 @@
-description: Income-based JSA for persons aged 18-24
+description: Income-based Jobseeker's Allowance for persons aged 18-24
 values:
-  2015-06-01:
-    value: 57.90
-  2020-06-01:
-    value: 59.07
+  2015-06-01: 57.90
+  2020-06-01: 59.07
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/contrib/amount_over_25.yaml b/openfisca_uk/parameters/benefit/JSA/contrib/amount_over_25.yaml
index 86ba04deb..214fd2511 100644
--- a/openfisca_uk/parameters/benefit/JSA/contrib/amount_over_25.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/contrib/amount_over_25.yaml
@@ -1,9 +1,7 @@
-description: Contributory JSA for persons aged over 25
+description: Contributory Jobseeker's Allowance for persons aged over 25
 values:
-  2015-06-01:
-    value: 73.10
-  2020-06-01:
-    value: 74.58
+  2015-06-01: 73.10
+  2020-06-01: 74.58
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/contrib/earn_disregard.yaml b/openfisca_uk/parameters/benefit/JSA/contrib/earn_disregard.yaml
index 40822894d..4ff476930 100644
--- a/openfisca_uk/parameters/benefit/JSA/contrib/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/contrib/earn_disregard.yaml
@@ -1,7 +1,6 @@
-description: Threshold in earnings, above which the contributory JSA amount is reduced
+description: Threshold in earnings, above which the contributory Jobseeker's Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/contrib/pension_disregard.yaml b/openfisca_uk/parameters/benefit/JSA/contrib/pension_disregard.yaml
index 469a9c174..5b8436345 100644
--- a/openfisca_uk/parameters/benefit/JSA/contrib/pension_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/contrib/pension_disregard.yaml
@@ -1,7 +1,6 @@
-description: Threshold in occupational and personal pensions, above which the contributory JSA amount is reduced
+description: Threshold in occupational and personal pensions, above which the contributory Jobseeker's Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 50.00
+  2015-06-01: 50.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/hours/couple.yaml b/openfisca_uk/parameters/benefit/JSA/hours/couple.yaml
index 32b9d9f4b..23e69f7f9 100644
--- a/openfisca_uk/parameters/benefit/JSA/hours/couple.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/hours/couple.yaml
@@ -1,6 +1,5 @@
-description: Hours requirement for joint claimants
+description: Hours requirement for joint claimants of Jobseeker's Allowance
 values:
-  2015-06-01:
-    value: 24
+  2015-06-01: 24
 metadata:
   unit: hour
diff --git a/openfisca_uk/parameters/benefit/JSA/hours/single.yaml b/openfisca_uk/parameters/benefit/JSA/hours/single.yaml
index 5d03035d6..0a13a3767 100644
--- a/openfisca_uk/parameters/benefit/JSA/hours/single.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/hours/single.yaml
@@ -1,6 +1,5 @@
-description: Hours requirement for single claimants
+description: Hours requirement for single claimants of Jobseeker's Allowance
 values:
-  2015-06-01:
-    value: 16
+  2015-06-01: 16
 metadata:
   unit: hour
diff --git a/openfisca_uk/parameters/benefit/JSA/income/amount_18_24.yaml b/openfisca_uk/parameters/benefit/JSA/income/amount_18_24.yaml
index aa2a78cde..525b40eaf 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/amount_18_24.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/amount_18_24.yaml
@@ -1,9 +1,7 @@
-description: Contributory JSA for persons aged 18-24
+description: Contributory Jobseeker's Allowance for persons aged 18-24
 values:
-  2015-06-01:
-    value: 57.90
-  2020-06-01:
-    value: 59.07
+  2015-06-01: 57.90
+  2020-06-01: 59.07
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/income/amount_over_25.yaml b/openfisca_uk/parameters/benefit/JSA/income/amount_over_25.yaml
index 211710740..5c938dae7 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/amount_over_25.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/amount_over_25.yaml
@@ -1,9 +1,7 @@
-description: Income-based JSA for persons aged over 25
+description: Income-based Jobseeker's Allowance for persons aged over 25
 values:
-  2015-06-01:
-    value: 73.10
-  2020-06-01:
-    value: 74.58
+  2015-06-01: 73.10
+  2020-06-01: 74.58
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/income/couple.yaml b/openfisca_uk/parameters/benefit/JSA/income/couple.yaml
index 5fdb43680..d1f9b93ac 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/couple.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/couple.yaml
@@ -1,9 +1,7 @@
-description: Weekly contributory JSA for couples
+description: Weekly contributory Jobseeker's Allowance for couples
 values:
-  2015-06-01:
-    value: 57.90
-  2020-06-01:
-    value: 116.80
+  2015-06-01: 57.90
+  2020-06-01: 116.80
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_couple.yaml
index 2cf6d1991..b94c9cd22 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_couple.yaml
@@ -1,7 +1,6 @@
-description: Threshold in income for a couple, above which the contributory JSA amount is reduced
+description: Threshold in income for a couple, above which the contributory Jobseeker's Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 10.00
+  2015-06-01: 10.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_lone_parent.yaml
index 4b682099a..edf57b776 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_lone_parent.yaml
@@ -1,7 +1,6 @@
-description: Threshold in income for a lone parent, above which the contributory JSA amount is reduced
+description: Threshold in income for a lone parent, above which the contributory Jobseeker's Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 20.00
+  2015-06-01: 20.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_single.yaml
index 0b6ef5b6c..0fb1918f4 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_single.yaml
@@ -1,7 +1,6 @@
-description: Threshold in income for a single person, above which the Income Support amount is reduced
+description: Threshold in income for a single person, above which the Jobseeker's Allowance amount is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/JSA/income/takeup.yaml b/openfisca_uk/parameters/benefit/JSA/income/takeup.yaml
index 9272c26d3..12792cc02 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/takeup.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/takeup.yaml
@@ -6,7 +6,7 @@ values:
   2014-04-06: 0.59
   2015-04-06: 0.56
 metadata:
-  label: Income-based JSA take-up rate
+  label: Income-based Jobseeker's Allowance take-up rate
   name: JSA_income_takeup
   unit: /1
   reference: 
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_1.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_1.yaml
index 2b15e9062..5f6ce119a 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_1.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_1.yaml
@@ -1,7 +1,6 @@
 description: LHA maximum rate for accommodation in Maidstone, Kent
 values:
-  2015-06-01:
-    value: 123.57
+  2015-06-01: 123.57
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_2.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_2.yaml
index d303a470e..0809b1c00 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_2.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_2.yaml
@@ -1,7 +1,6 @@
 description: LHA maximum rate for accommodation in Maidstone, Kent
 values:
-  2015-06-01:
-    value: 157.56
+  2015-06-01: 157.56
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_3.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_3.yaml
index 9b6a14deb..58081398d 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_3.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_3.yaml
@@ -1,7 +1,6 @@
 description: LHA maximum rate for accommodation in Maidstone, Kent
 values:
-  2015-06-01:
-    value: 180.45
+  2015-06-01: 180.45
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_4.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_4.yaml
index 5eda283ce..74e37ec58 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_4.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_4.yaml
@@ -1,7 +1,6 @@
 description: LHA maximum rate for accommodation in Maidstone, Kent
 values:
-  2015-06-01:
-    value: 235.41
+  2015-06-01: 235.41
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/shared.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/shared.yaml
index e05ecb583..73b017407 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/shared.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/shared.yaml
@@ -1,7 +1,6 @@
 description: LHA maximum rate for accommodation in Maidstone, Kent
 values:
-  2015-06-01:
-    value: 68.28
+  2015-06-01: 68.28
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/PIP/daily_living/higher.yaml b/openfisca_uk/parameters/benefit/PIP/daily_living/higher.yaml
index e5eee6a1a..cf7496a58 100644
--- a/openfisca_uk/parameters/benefit/PIP/daily_living/higher.yaml
+++ b/openfisca_uk/parameters/benefit/PIP/daily_living/higher.yaml
@@ -1,7 +1,6 @@
-description: Upper rate of the daily living component of PIP
+description: Upper rate of the daily living component of Personal Independent Payment
 values:
-  2015-06-04:
-    value: 89.15
+  2015-06-04: 89.15
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/pip/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/PIP/daily_living/lower.yaml b/openfisca_uk/parameters/benefit/PIP/daily_living/lower.yaml
index ec3ca0e5b..10011eb5b 100644
--- a/openfisca_uk/parameters/benefit/PIP/daily_living/lower.yaml
+++ b/openfisca_uk/parameters/benefit/PIP/daily_living/lower.yaml
@@ -1,7 +1,6 @@
-description: Lower rate of the daily living component of PIP
+description: Lower rate of the daily living component of Personal Independent Payment
 values:
-  2015-06-04:
-    value: 59.70
+  2015-06-04: 59.70
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/pip/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/PIP/mobility/higher.yaml b/openfisca_uk/parameters/benefit/PIP/mobility/higher.yaml
index 94a0bcb85..840fd7bfe 100644
--- a/openfisca_uk/parameters/benefit/PIP/mobility/higher.yaml
+++ b/openfisca_uk/parameters/benefit/PIP/mobility/higher.yaml
@@ -1,7 +1,6 @@
-description: Upper rate of the mobility component of PIP
+description: Upper rate of the mobility component of Personal Independent Payment
 values:
-  2015-06-04:
-    value: 62.25
+  2015-06-04: 62.25
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/pip/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/PIP/mobility/lower.yaml b/openfisca_uk/parameters/benefit/PIP/mobility/lower.yaml
index a5a13fafe..d4e0879cc 100644
--- a/openfisca_uk/parameters/benefit/PIP/mobility/lower.yaml
+++ b/openfisca_uk/parameters/benefit/PIP/mobility/lower.yaml
@@ -1,7 +1,6 @@
-description: Lower rate of the mobility component of PIP
+description: Lower rate of the mobility component of Personal Independent Payment
 values:
-  2015-06-04:
-    value: 23.60
+  2015-06-04: 23.60
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/pip/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/attendance_allowance/lower.yaml b/openfisca_uk/parameters/benefit/attendance_allowance/lower.yaml
index ce8f5c6fd..fd6b6e7f9 100644
--- a/openfisca_uk/parameters/benefit/attendance_allowance/lower.yaml
+++ b/openfisca_uk/parameters/benefit/attendance_allowance/lower.yaml
@@ -1,7 +1,6 @@
-description: Lower attendance allowance amount.
+description: Lower Attendance Allowance amount.
 values:
-  2015-06-01:  # TODO: confirm start year.
-    value: 59.70
+  2015-06-01: 59.70
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/attendance_allowance/upper.yaml b/openfisca_uk/parameters/benefit/attendance_allowance/upper.yaml
index cf6bdc38f..e15c2202c 100644
--- a/openfisca_uk/parameters/benefit/attendance_allowance/upper.yaml
+++ b/openfisca_uk/parameters/benefit/attendance_allowance/upper.yaml
@@ -1,7 +1,6 @@
-description: Upper attendance allowance amount.
+description: Upper Attendance Allowance amount.
 values:
-  2015-06-01:  # TODO: confirm start year.
-    value: 89.15
+  2015-06-01: 89.15
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/benefit_cap/has_children.yaml b/openfisca_uk/parameters/benefit/benefit_cap/has_children.yaml
index a44ee54f8..f0fe9318b 100644
--- a/openfisca_uk/parameters/benefit/benefit_cap/has_children.yaml
+++ b/openfisca_uk/parameters/benefit/benefit_cap/has_children.yaml
@@ -1,7 +1,6 @@
 description: Benefit cap for benefit units with children outside of London
 values:
-  2013-08-12:
-    value: 384.62
+  2013-08-12: 384.62
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/benefit_cap/london_children.yaml b/openfisca_uk/parameters/benefit/benefit_cap/london_children.yaml
index 5548a5aad..50a0b339d 100644
--- a/openfisca_uk/parameters/benefit/benefit_cap/london_children.yaml
+++ b/openfisca_uk/parameters/benefit/benefit_cap/london_children.yaml
@@ -1,7 +1,6 @@
 description: Benefit cap for benefit units with children in London
 values:
-  2013-08-12:
-    value: 442.31
+  2013-08-12: 442.31
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/benefit_cap/london_no_children.yaml b/openfisca_uk/parameters/benefit/benefit_cap/london_no_children.yaml
index c49099ba8..103b9084e 100644
--- a/openfisca_uk/parameters/benefit/benefit_cap/london_no_children.yaml
+++ b/openfisca_uk/parameters/benefit/benefit_cap/london_no_children.yaml
@@ -1,7 +1,6 @@
 description: Benefit cap for benefit units without children in London
 values:
-  2013-08-12:
-    value: 296.35
+  2013-08-12: 296.35
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/benefit_cap/no_children.yaml b/openfisca_uk/parameters/benefit/benefit_cap/no_children.yaml
index f4544a0aa..6ab5453f1 100644
--- a/openfisca_uk/parameters/benefit/benefit_cap/no_children.yaml
+++ b/openfisca_uk/parameters/benefit/benefit_cap/no_children.yaml
@@ -1,7 +1,6 @@
 description: Benefit cap for benefit units without children outside of London
 values:
-  2013-08-12:
-    value: 257.69
+  2013-08-12: 257.69
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/carer_premium/couple.yaml b/openfisca_uk/parameters/benefit/carer_premium/couple.yaml
index 164e8f465..a461d4533 100644
--- a/openfisca_uk/parameters/benefit/carer_premium/couple.yaml
+++ b/openfisca_uk/parameters/benefit/carer_premium/couple.yaml
@@ -1,7 +1,6 @@
 description: Carer premium for two qualifying carers
 values:
-  2010-01-01:
-    value: 37.50
+  2010-01-01: 37.50
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/carer_premium/single.yaml b/openfisca_uk/parameters/benefit/carer_premium/single.yaml
index b38a6f133..21a1bfaae 100644
--- a/openfisca_uk/parameters/benefit/carer_premium/single.yaml
+++ b/openfisca_uk/parameters/benefit/carer_premium/single.yaml
@@ -1,7 +1,6 @@
 description: Carer premium for one qualifying carer
 values:
-  2010-01-01:
-    value: 37.50
+  2010-01-01: 37.50
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/carers_allowance/amount.yaml b/openfisca_uk/parameters/benefit/carers_allowance/amount.yaml
index e4a2e5ff2..c95a8154a 100644
--- a/openfisca_uk/parameters/benefit/carers_allowance/amount.yaml
+++ b/openfisca_uk/parameters/benefit/carers_allowance/amount.yaml
@@ -1,7 +1,6 @@
-description: Weekly Carer's Allowance amount.
+description: Weekly Carer's Allowance amount
 values:
-  2015-06-01:  # TODO: confirm start year.
-    value: 67.25
+  2015-06-01: 67.25
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/carers_allowance/min_hours.yaml b/openfisca_uk/parameters/benefit/carers_allowance/min_hours.yaml
index 16e148d11..d7f1a69be 100644
--- a/openfisca_uk/parameters/benefit/carers_allowance/min_hours.yaml
+++ b/openfisca_uk/parameters/benefit/carers_allowance/min_hours.yaml
@@ -1,7 +1,6 @@
-description: Minimum number of hours spent providing care
+description: Minimum number of hours spent providing care to qualify for Carer's Allowance
 values:
-  2010-06-01:
-    value: 35
+  2010-06-01: 35
 metadata:
   period: week
   unit: hour
diff --git a/openfisca_uk/parameters/benefit/constant_attendance_allowance/exceptional_rate.yaml b/openfisca_uk/parameters/benefit/constant_attendance_allowance/exceptional_rate.yaml
index 58054ba25..e2500c660 100644
--- a/openfisca_uk/parameters/benefit/constant_attendance_allowance/exceptional_rate.yaml
+++ b/openfisca_uk/parameters/benefit/constant_attendance_allowance/exceptional_rate.yaml
@@ -1,7 +1,6 @@
-description: Exceptional rate for Constant Attendance Allowance.
+description: Exceptional rate for Constant Attendance Allowance
 values:
-  2015-06-01:  # TODO: confirm start year.
-    value: 145.60
+  2015-06-01: 145.60
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/constant_attendance_allowance/full_day_rate.yaml b/openfisca_uk/parameters/benefit/constant_attendance_allowance/full_day_rate.yaml
index 98b188054..b6987a5dc 100644
--- a/openfisca_uk/parameters/benefit/constant_attendance_allowance/full_day_rate.yaml
+++ b/openfisca_uk/parameters/benefit/constant_attendance_allowance/full_day_rate.yaml
@@ -1,7 +1,6 @@
-description: Full day rate for Constant Attendance Allowance.
+description: Full day rate for Constant Attendance Allowance
 values:
-  2015-06-01:  # TODO: confirm start year.
-    value: 72.80
+  2015-06-01: 72.80
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/constant_attendance_allowance/intermediate_rate.yaml b/openfisca_uk/parameters/benefit/constant_attendance_allowance/intermediate_rate.yaml
index 380c38ee6..9cc13ca5f 100644
--- a/openfisca_uk/parameters/benefit/constant_attendance_allowance/intermediate_rate.yaml
+++ b/openfisca_uk/parameters/benefit/constant_attendance_allowance/intermediate_rate.yaml
@@ -1,7 +1,6 @@
-description: Intermediate rate for Constant Attendance Allowance.
+description: Intermediate rate for Constant Attendance Allowance
 values:
-  2015-06-01:  # TODO: confirm start year.
-    value: 109.20
+  2015-06-01: 109.20
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/constant_attendance_allowance/part_day_rate.yaml b/openfisca_uk/parameters/benefit/constant_attendance_allowance/part_day_rate.yaml
index 9fa84ea6a..f77df90c0 100644
--- a/openfisca_uk/parameters/benefit/constant_attendance_allowance/part_day_rate.yaml
+++ b/openfisca_uk/parameters/benefit/constant_attendance_allowance/part_day_rate.yaml
@@ -1,7 +1,6 @@
-description: Part day rate for Constant Attendance Allowance.
+description: Part day rate for Constant Attendance Allowance
 values:
-  2015-06-01:  # TODO: confirm start year.
-    value: 36.40
+  2015-06-01: 36.40
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/disability_premia/disability_couple.yaml b/openfisca_uk/parameters/benefit/disability_premia/disability_couple.yaml
index 8d914cf35..a42556771 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/disability_couple.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/disability_couple.yaml
@@ -1,7 +1,6 @@
 description: Disability premium for a couple
 values:
-  2015-06-01:
-    value: 49.80
+  2015-06-01: 49.80
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/disability_premia/disability_single.yaml b/openfisca_uk/parameters/benefit/disability_premia/disability_single.yaml
index 63228fdeb..a38ee8441 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/disability_single.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/disability_single.yaml
@@ -1,7 +1,6 @@
 description: Disability premium for a single person
 values:
-  2015-06-01:
-    value: 34.95
+  2015-06-01: 34.95
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/disability_premia/enhanced_couple.yaml b/openfisca_uk/parameters/benefit/disability_premia/enhanced_couple.yaml
index 40640e5fe..b8bcd34af 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/enhanced_couple.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/enhanced_couple.yaml
@@ -1,7 +1,6 @@
-description: Enhanced disability premium for a couple, invalid for ESA
+description: Enhanced disability premium for a couple, invalid for Employment and Support Allowance
 values:
-  2015-06-01:
-    value: 24.50
+  2015-06-01: 24.50
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/disability_premia/enhanced_single.yaml b/openfisca_uk/parameters/benefit/disability_premia/enhanced_single.yaml
index 81ac617e5..82e646286 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/enhanced_single.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/enhanced_single.yaml
@@ -1,7 +1,6 @@
-description: Enhanced disability premium for a single person, invalid for ESA
+description: Enhanced disability premium for a single person, invalid for Employment and Support Allowance
 values:
-  2015-06-01:
-    value: 17.10
+  2015-06-01: 17.10
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/disability_premia/severe_couple.yaml b/openfisca_uk/parameters/benefit/disability_premia/severe_couple.yaml
index ee965ef0e..f19b76518 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/severe_couple.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/severe_couple.yaml
@@ -1,7 +1,6 @@
 description: Severe disability premium for a couple where both are eligible
 values:
-  2015-06-01:
-    value: 133.90
+  2015-06-01: 133.90
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/disability_premia/severe_single.yaml b/openfisca_uk/parameters/benefit/disability_premia/severe_single.yaml
index ff9d42076..7a6858456 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/severe_single.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/severe_single.yaml
@@ -1,7 +1,6 @@
 description: Severe disability premium for a single person
 values:
-  2015-06-01:
-    value: 66.95
+  2015-06-01: 66.95
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/child.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/child.yaml
index 040170f93..c5555193f 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/child.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/child.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance increase for a child for Housing Benefit
 values:
-  2015-06-01:
-    value: 66.90
+  2015-06-01: 66.90
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/SP_age.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/SP_age.yaml
index 9e05ed6dd..e4ee59176 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/SP_age.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/SP_age.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance for Housing Benefit for a couple, at least one State Pension age
 values:
-  2015-06-01:
-    value: 270.60
+  2015-06-01: 270.60
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/both_under_18.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/both_under_18.yaml
index 782cb82ed..49387eab5 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/both_under_18.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/both_under_18.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance for Housing Benefit for a couple, both aged under 18
 values:
-  2015-06-01:
-    value: 87.50
+  2015-06-01: 87.50
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/over_18.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/over_18.yaml
index 7b36b8a63..ca617e121 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/over_18.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/over_18.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance for Housing Benefit for a couple, one aged over 18
 values:
-  2015-06-01:
-    value: 114.85
+  2015-06-01: 114.85
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/SP_age.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/SP_age.yaml
index 70d352f07..804798ecf 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/SP_age.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/SP_age.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance for Housing Benefit for a lone parent over State Pension age
 values:
-  2015-06-01:
-    value: 181
+  2015-06-01: 181
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/over_18.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/over_18.yaml
index ed08f75b3..9ac771587 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/over_18.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/over_18.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance for Housing Benefit for a lone parent aged over 18
 values:
-  2015-06-01:
-    value: 73.10
+  2015-06-01: 73.10
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/under_18.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/under_18.yaml
index 07c011b77..16192029d 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/under_18.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/under_18.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance for Housing Benefit for a lone parent under 18
 values:
-  2015-06-01:
-    value: 57.90
+  2015-06-01: 57.90
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/SP_age.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/SP_age.yaml
index c77357249..4fdd4f5ca 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/SP_age.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/SP_age.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance for Housing Benefit for a single person over State Pension age
 values:
-  2015-06-01:
-    value: 181.00
+  2015-06-01: 181.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/over_25.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/over_25.yaml
index df0b3dd1c..a8c1d2ff6 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/over_25.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/over_25.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance for Housing Benefit for a single person over 25
 values:
-  2015-06-01:
-    value: 73.10
+  2015-06-01: 73.10
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/under_25.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/under_25.yaml
index 988b82807..116c1e888 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/under_25.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/under_25.yaml
@@ -1,7 +1,6 @@
 description: Personal allowance for Housing Benefit for a single person under 25
 values:
-  2015-06-01:
-    value: 57.90
+  2015-06-01: 57.90
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/deductions/non_dep_deduction.yaml b/openfisca_uk/parameters/benefit/housing_benefit/deductions/non_dep_deduction.yaml
index 18fef21ec..b5b8408b9 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/deductions/non_dep_deduction.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/deductions/non_dep_deduction.yaml
@@ -1,4 +1,4 @@
-description: Non-dependent deduction for an individual
+description: Housing Benefit non-dependent deduction for an individual
 brackets:
   - amount:
       2018-06-18: 15.25
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/premiums/disabled_child.yaml b/openfisca_uk/parameters/benefit/housing_benefit/premiums/disabled_child.yaml
index 8c2aa6fd2..2278bcc9c 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/premiums/disabled_child.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/premiums/disabled_child.yaml
@@ -1,7 +1,6 @@
 description: Disabled child premium for Housing Benefit
 values:
-  2019-06-01:
-    value: 64.19
+  2019-06-01: 64.19
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_couple.yaml b/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_couple.yaml
index 06bb99e8b..0460ad97c 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_couple.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_couple.yaml
@@ -1,7 +1,6 @@
 description: Family premium for Housing Benefit
 values:
-  2019-06-01:
-    value: 17.45
+  2019-06-01: 17.45
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_lone.yaml b/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_lone.yaml
index 00c53426f..f04957c1b 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_lone.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_lone.yaml
@@ -1,7 +1,6 @@
 description: Family premium for Housing Benefit
 values:
-  2019-06-01:
-    value: 22.20
+  2019-06-01: 22.20
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_16_24.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_16_24.yaml
index 74142b1a2..4c27e8773 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_16_24.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_16_24.yaml
@@ -1,7 +1,6 @@
-description: Income support applicable amount for single persons aged 18-24
+description: Income Support applicable amount for single persons aged 18-24
 values:
-  2015-06-01:
-    value: 58.90
+  2015-06-01: 58.90
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_16_17.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_16_17.yaml
index c98450383..c1ed8dd81 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_16_17.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_16_17.yaml
@@ -1,7 +1,6 @@
 description: Income Support applicable amount for couples both aged under 18
 values:
-  2015-06-01:
-    value: 58.90
+  2015-06-01: 58.90
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_age_gap.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_age_gap.yaml
index bd4833ee3..c7c370b2a 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_age_gap.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_age_gap.yaml
@@ -1,7 +1,6 @@
 description: Income Support applicable amount for couples in which one is under 18 and one over 25
 values:
-  2015-06-01:
-    value: 74.35
+  2015-06-01: 74.35
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_over_18.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_over_18.yaml
index 28a918124..8bd4632a3 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_over_18.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_over_18.yaml
@@ -1,7 +1,6 @@
 description: Income Support applicable amount for couples aged over 18
 values:
-  2015-06-01:
-    value: 116.80
+  2015-06-01: 116.80
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_16_17.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_16_17.yaml
index ad23272dc..fa2539daa 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_16_17.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_16_17.yaml
@@ -1,7 +1,6 @@
 description: Income Support applicable amount for lone parents aged under 18
 values:
-  2015-06-01:
-    value: 58.90
+  2015-06-01: 58.90
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_over_18.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_over_18.yaml
index c2cdf88d0..b59104753 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_over_18.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_over_18.yaml
@@ -1,7 +1,6 @@
 description: Income Support applicable amount for lone parents aged over 18
 values:
-  2015-06-01:
-    value: 74.35
+  2015-06-01: 74.35
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_over_25.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_over_25.yaml
index a8f6d7af4..3293362ce 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_over_25.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_over_25.yaml
@@ -1,7 +1,6 @@
 description: Income Support applicable amount for single persons aged over 25
 values:
-  2015-06-01:
-    value: 74.35
+  2015-06-01: 74.35
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/withdrawal_rate.yaml b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/withdrawal_rate.yaml
index 6d8985b82..275f088e9 100644
--- a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/withdrawal_rate.yaml
+++ b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/withdrawal_rate.yaml
@@ -1,7 +1,6 @@
 description: Reduction rate for Savings Credit over the threshold
 values:
-  2015-06-01:
-    value: 0.4
+  2015-06-01: 0.4
 metadata:
   period: week
   unit: /1
diff --git a/openfisca_uk/parameters/benefit/state_pension/female_age.yaml b/openfisca_uk/parameters/benefit/state_pension/female_age.yaml
index 1a35017e1..02be4b75c 100644
--- a/openfisca_uk/parameters/benefit/state_pension/female_age.yaml
+++ b/openfisca_uk/parameters/benefit/state_pension/female_age.yaml
@@ -1,19 +1,12 @@
-description: Female state pension age
+description: Female State Pension age
 values:
-  1950-01-05:
-    value: 60
-  2010-01-01:
-    value: 61
-  2012-01-01:
-    value: 62
-  2014-01-01:
-    value: 63
-  2016-01-01:
-    value: 64
-  2018-01-01:
-    value: 65
-  2020-01-01:
-    value: 66
+  1950-01-05: 60
+  2010-01-01: 61
+  2012-01-01: 62
+  2014-01-01: 63
+  2016-01-01: 64
+  2018-01-01: 65
+  2020-01-01: 66
 metadata:
   unit: year
   reference: https://www.iser.essex.ac.uk/research/publications/working-papers/cempa/cempa7-20.pdf#page=88
diff --git a/openfisca_uk/parameters/benefit/state_pension/male_age.yaml b/openfisca_uk/parameters/benefit/state_pension/male_age.yaml
index 67ee0df3e..6584383e5 100644
--- a/openfisca_uk/parameters/benefit/state_pension/male_age.yaml
+++ b/openfisca_uk/parameters/benefit/state_pension/male_age.yaml
@@ -1,9 +1,7 @@
-description: Male state pension age
+description: Male State Pension age
 values:
-  1950-01-05:
-    value: 65
-  2020-01-01:
-    value: 66
+  1950-01-05: 65
+  2020-01-01: 66
 metadata:
   unit: year
   reference: https://www.iser.essex.ac.uk/research/publications/working-papers/cempa/cempa7-20.pdf#page=88
diff --git a/openfisca_uk/parameters/benefit/state_pension/triple_lock_minimum.yaml b/openfisca_uk/parameters/benefit/state_pension/triple_lock_minimum.yaml
index 22ade313d..2dadf9443 100644
--- a/openfisca_uk/parameters/benefit/state_pension/triple_lock_minimum.yaml
+++ b/openfisca_uk/parameters/benefit/state_pension/triple_lock_minimum.yaml
@@ -1,7 +1,6 @@
 description: Minimum increase in the State Pension
 values:
-  2015-06-01:
-    value: 0.025
+  2015-06-01: 0.025
 metadata:
   unit: /1
   reference:
diff --git a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/two_child_limit_year.yaml b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/two_child_limit_year.yaml
index 4bbdc334f..036695882 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/two_child_limit_year.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/two_child_limit_year.yaml
@@ -1,7 +1,6 @@
-description: Year of the two child limit introduction
+description: Year of the Child Tax Credit's two child limit introduction
 values:
-  2015-04-04:
-    value: 2017
+  2015-04-04: 2017
 metadata:
   unit: year
   reference: https://www.gov.uk/guidance/child-tax-credit-exceptions-to-the-2-child-limit
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/basic.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/basic.yaml
index ea42a4a70..ab0e8beb8 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/basic.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/basic.yaml
@@ -1,12 +1,9 @@
 description: Working Tax Credit basic element
 values:
-  2019-04-06:
-    value: 1960
-  2020-04-06:
-    # NB: EUROMOD reports 2000. This is the gov.uk value.
-    value: 3040
-  2021-04-06:
-    value: 2005
+  2019-04-06: 1_960
+  # NB: EUROMOD reports 2_000 for 2020. This is the gov.uk value.
+  2020-04-06: 3_040
+  2021-04-06: 2_005
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_1.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_1.yaml
index 0f63d21d3..1a4c65d23 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_1.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_1.yaml
@@ -1,7 +1,6 @@
 description: Working Tax Credit childcare element for one child
 values:
-  2016-04-06:
-    value: 122.50  # 175 * 70%
+  2016-04-06: 122.50  # 175 * 70%
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_2.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_2.yaml
index af9faa802..09ebc5411 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_2.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_2.yaml
@@ -1,7 +1,6 @@
 description: Working Tax Credit childcare element for two or more children
 values:
-  2016-04-06:
-    value: 210  # 300 * 70%
+  2016-04-06: 210  # 300 * 70%
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_coverage.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_coverage.yaml
index ddb0cfd58..8794d1ab4 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_coverage.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_coverage.yaml
@@ -1,7 +1,6 @@
 description: Proportion of eligible childcare costs covered by Working Tax Credit
 values:
-  2016-04-06:
-    value: 0.7
+  2016-04-06: 0.7
 metadata:
   period: week
   unit: /1
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/couple.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/couple.yaml
index 8775adbd1..70851358d 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/couple.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/couple.yaml
@@ -1,12 +1,9 @@
 description: Working Tax Credit couple element
 values:
-  2016-04-06:
-    value: 2010
-  2020-04-06:
-    # NB: EUROMOD reports 2055. This is the uk.gov value.
-    value: 2045
-  2021-04-06:
-    value: 2060
+  2016-04-06: 2_010
+  # NB: EUROMOD reports 2_055 for 2020. This is the gov.uk value.
+  2020-04-06: 2_045
+  2021-04-06: 2_060
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/disabled.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/disabled.yaml
index 7a4310094..ce44ab517 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/disabled.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/disabled.yaml
@@ -1,18 +1,12 @@
 description: Working Tax Credit disability element
 values:
-  2016-04-06:
-    value: 2970
-  2017-04-06:
-    value: 3000
-  2018-04-06:
-    value: 3090
-  2019-04-06:
-    value: 3165
-  2020-04-06:
-    # NB: EUROMOD reports 3230. This is the gov.uk value.
-    value: 3220
-  2021-04-06:
-    value: 3240
+  2016-04-06: 2_970
+  2017-04-06: 3_000
+  2018-04-06: 3_090
+  2019-04-06: 3_165
+  # NB: EUROMOD reports 3_230 for 2020. This is the gov.uk value.
+  2020-04-06: 3_220
+  2021-04-06: 3_240
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/lone_parent.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/lone_parent.yaml
index 9b7855bb8..640aace2e 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/lone_parent.yaml
@@ -1,12 +1,9 @@
 description: Working Tax Credit lone parent element
 values:
-  2016-04-06:
-    value: 2010
-  2020-04-06:
-    # NB: EUROMOD reports 2055. This is the uk.gov value.
-    value: 2045
-  2021-04-06:
-    value: 2060
+  2016-04-06: 2_010
+  # NB: EUROMOD reports 2_055 for 2020. This is the gov.uk value.
+  2020-04-06: 2_045
+  2021-04-06: 2_060
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/severely_disabled.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/severely_disabled.yaml
index 2bc9e3c45..a10f697a5 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/severely_disabled.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/severely_disabled.yaml
@@ -1,18 +1,12 @@
 description: Working Tax Credit severe disability element
 values:
-  2016-04-06:
-    value: 1275
-  2017-04-06:
-    value: 1290
-  2018-04-06:
-    value: 1330
-  2019-04-06:
-    value: 1365
-  2020-04-06:
-    # NB: EUROMOD reports 1395. This is the gov.uk value.
-    value: 1390
-  2021-04-06:
-    value: 1400
+  2016-04-06: 1_275
+  2017-04-06: 1_290
+  2018-04-06: 1_330
+  2019-04-06: 1_365
+  # NB: EUROMOD reports 1_395 for 2020. This is the gov.uk value.
+  2020-04-06: 1_390
+  2021-04-06: 1_400
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/worker.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/worker.yaml
index 434976acd..c43a67e4d 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/worker.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/worker.yaml
@@ -1,12 +1,9 @@
 description: Working Tax Credit 30 hours element
 values:
-  2016-04-06:
-    value: 810
-  2020-04-06:
-    # NB: EUROMOD reports 830. This is the gov.uk value.
-    value: 825
-  2021-04-06:
-    value: 830
+  2016-04-06: 810
+  # NB: EUROMOD reports 830 for 2020. This is the gov.uk value.
+  2020-04-06: 825
+  2021-04-06: 830
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/couple_with_children.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/couple_with_children.yaml
index 3bd3af9a8..aee00b4de 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/couple_with_children.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/couple_with_children.yaml
@@ -1,7 +1,6 @@
-description: Couple with children hours requirement
+description: Couple with children hours requirement for Working Tax Credit
 values:
-  2015-06-01:
-    value: 24
+  2015-06-01: 24
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/default.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/default.yaml
index 506a90197..8637533b3 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/default.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/default.yaml
@@ -1,7 +1,6 @@
-description: Default hours requirement
+description: Default hours requirement for Working Tax Credit
 values:
-  2015-06-01:
-    value: 30
+  2015-06-01: 30
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/lower.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/lower.yaml
index 87a165bd1..64fd3ebb8 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/lower.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/lower.yaml
@@ -1,7 +1,6 @@
-description: Lower hours requirement
+description: Lower hours requirement for Working Tax Credit
 values:
-  2015-06-01:
-    value: 16
+  2015-06-01: 16
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/old_age.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/old_age.yaml
index f9969149f..91712f34f 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/old_age.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/old_age.yaml
@@ -1,7 +1,6 @@
-description: Age for lower hours requirement
+description: Age for lower hours requirement for Working Tax Credit
 values:
-  2015-06-01:
-    value: 60
+  2015-06-01: 60
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/universal_credit/elements/child/limit/num_children.yaml b/openfisca_uk/parameters/benefit/universal_credit/elements/child/limit/num_children.yaml
index 4e87f6873..2faf3d5e5 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/elements/child/limit/num_children.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/elements/child/limit/num_children.yaml
@@ -1,4 +1,4 @@
-description: Limit on the number of children for which the UC child element is payable
+description: Limit on the number of children for which the Universal Credit child element is payable
 values:
   0001-01-01: 100
   2017-04-06: 2
diff --git a/openfisca_uk/parameters/benefit/universal_credit/elements/child/limit/start_year.yaml b/openfisca_uk/parameters/benefit/universal_credit/elements/child/limit/start_year.yaml
index eeb0e86a6..8376c3bae 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/elements/child/limit/start_year.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/elements/child/limit/start_year.yaml
@@ -1,4 +1,4 @@
-description: Year in which the child limit applies
+description: Year in which the Universal Credit child limit applies
 values:
   0001-01-01: 2017
 metadata:
diff --git a/openfisca_uk/parameters/benefit/universal_credit/elements/childcare/maximum.yaml b/openfisca_uk/parameters/benefit/universal_credit/elements/childcare/maximum.yaml
index d46149778..3034a22c3 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/elements/childcare/maximum.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/elements/childcare/maximum.yaml
@@ -1,10 +1,8 @@
 description: Maximum childcare costs paid by Universal Credit by the number of eligible children
 1:
-  values:
-    2017-04-10: 646.35
+  2017-04-10: 646.35
 2:
-  values:
-    2017-04-10: 1108.04
+  2017-04-10: 1108.04
 metadata:
   period: month
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/universal_credit/elements/housing/non_dep_deduction.yaml b/openfisca_uk/parameters/benefit/universal_credit/elements/housing/non_dep_deduction.yaml
index 7e743fa75..98e488fc6 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/elements/housing/non_dep_deduction.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/elements/housing/non_dep_deduction.yaml
@@ -1,4 +1,4 @@
-description: Non-dependent deduction for UC
+description: Non-dependent deduction for Universal Credit
 values:
   2017-06-01: 75.53
 metadata:
diff --git a/openfisca_uk/parameters/benefit/universal_credit/rollout_rate.yaml b/openfisca_uk/parameters/benefit/universal_credit/rollout_rate.yaml
index da8f756ca..6f2c60154 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/rollout_rate.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/rollout_rate.yaml
@@ -1,5 +1,5 @@
 description: Roll-out rate of Universal Credit
-values: # Interpolated quarterly
+values:  # Interpolated quarterly
   2010-01-01: 0
   2018-01-01: 0.2
   2018-04-01: 0.25
diff --git a/openfisca_uk/parameters/benefit/universal_credit/standard_allowance/amount.yaml b/openfisca_uk/parameters/benefit/universal_credit/standard_allowance/amount.yaml
index fb881c477..f08f63cd0 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/standard_allowance/amount.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/standard_allowance/amount.yaml
@@ -1,4 +1,4 @@
-description: Standard allowance
+description: Universal Credit standard allowance
 SINGLE_YOUNG:
   description: Standard allowance for single claimants under 25
   values:
@@ -6,7 +6,7 @@ SINGLE_YOUNG:
     2020-04-06: 344.00  # From gov.uk and entitledto
     2021-10-06: 257.33
   metadata:
-    label: UC single amount (under 25)
+    label: Universal Credit single amount (under 25)
     name: UC_single_young
     unit: currency-GBP
     period: month
@@ -17,7 +17,7 @@ SINGLE_OLD:
     2020-04-06: 411.51  # From gov.uk and entitledto
     2021-10-06: 324.84
   metadata:
-    label: UC single amount (over 25)
+    label: Universal Credit single amount (over 25)
     name: UC_single_old
     unit: currency-GBP
     period: month
@@ -28,7 +28,7 @@ COUPLE_YOUNG:
     2020-04-06: 490.60  # From gov.uk and entitledto
     2021-10-06: 403.93
   metadata:
-    label: UC couple amount (both under 25)
+    label: Universal Credit couple amount (both under 25)
     name: UC_couple_young
     unit: currency-GBP
     period: month
@@ -40,7 +40,7 @@ COUPLE_OLD:
     2020-04-06: 596.58  # From gov.uk/entitledto
     2021-10-06: 509.91
   metadata:
-    label: UC couple amount (one over 25)
+    label: Universal Credit couple amount (one over 25)
     name: UC_couple_old
     unit: currency-GBP
     period: month
diff --git a/openfisca_uk/parameters/benefit/universal_credit/work_requirements/default_expected_hours.yaml b/openfisca_uk/parameters/benefit/universal_credit/work_requirements/default_expected_hours.yaml
index c4fa2370a..711d8c725 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/work_requirements/default_expected_hours.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/work_requirements/default_expected_hours.yaml
@@ -1,7 +1,6 @@
-description: Default expected hours worked per week
+description: Default expected hours worked per week for Universal Credit
 values:
-  2013-04-29:
-    value: 35
+  2013-04-29: 35
 metadata:
   unit: hour
   reference:
diff --git a/openfisca_uk/parameters/demographic/equiv/ahc/child_over_14.yaml b/openfisca_uk/parameters/demographic/equiv/ahc/child_over_14.yaml
index 7d8c5cb2e..0dbdd2592 100644
--- a/openfisca_uk/parameters/demographic/equiv/ahc/child_over_14.yaml
+++ b/openfisca_uk/parameters/demographic/equiv/ahc/child_over_14.yaml
@@ -1,6 +1,5 @@
 description: Equivalisation factor for children over 14
 values:
-  2010-06-01:
-    value: 0.42
+  2010-06-01: 0.42
 metadata:
   unit: /1
diff --git a/openfisca_uk/parameters/demographic/equiv/ahc/child_under_14.yaml b/openfisca_uk/parameters/demographic/equiv/ahc/child_under_14.yaml
index 06f6caea7..648c40128 100644
--- a/openfisca_uk/parameters/demographic/equiv/ahc/child_under_14.yaml
+++ b/openfisca_uk/parameters/demographic/equiv/ahc/child_under_14.yaml
@@ -1,6 +1,5 @@
 description: Equivalisation factor for children under 14
 values:
-  2010-06-01:
-    value: 0.2
+  2010-06-01: 0.2
 metadata:
   unit: /1
diff --git a/openfisca_uk/parameters/demographic/equiv/ahc/first_adult.yaml b/openfisca_uk/parameters/demographic/equiv/ahc/first_adult.yaml
index fe3baf7a4..5ac7c34d7 100644
--- a/openfisca_uk/parameters/demographic/equiv/ahc/first_adult.yaml
+++ b/openfisca_uk/parameters/demographic/equiv/ahc/first_adult.yaml
@@ -1,6 +1,5 @@
 description: Equivalisation factor for the first adult
 values:
-  2010-06-01:
-    value: 0.58
+  2010-06-01: 0.58
 metadata:
   unit: /1
diff --git a/openfisca_uk/parameters/demographic/equiv/ahc/second_adult.yaml b/openfisca_uk/parameters/demographic/equiv/ahc/second_adult.yaml
index f967b91a2..bde64d911 100644
--- a/openfisca_uk/parameters/demographic/equiv/ahc/second_adult.yaml
+++ b/openfisca_uk/parameters/demographic/equiv/ahc/second_adult.yaml
@@ -1,6 +1,5 @@
 description: Equivalisation factor for the second adult
 values:
-  2010-06-01:
-    value: 0.42
+  2010-06-01: 0.42
 metadata:
   unit: /1
diff --git a/openfisca_uk/parameters/demographic/equiv/bhc/child_over_14.yaml b/openfisca_uk/parameters/demographic/equiv/bhc/child_over_14.yaml
index c7d487a5d..02e2b3ff3 100644
--- a/openfisca_uk/parameters/demographic/equiv/bhc/child_over_14.yaml
+++ b/openfisca_uk/parameters/demographic/equiv/bhc/child_over_14.yaml
@@ -1,6 +1,5 @@
 description: Equivalisation factor for children over 14
 values:
-  2010-06-01:
-    value: 0.33
+  2010-06-01: 0.33
 metadata:
   unit: /1
diff --git a/openfisca_uk/parameters/demographic/equiv/bhc/child_under_14.yaml b/openfisca_uk/parameters/demographic/equiv/bhc/child_under_14.yaml
index 06f6caea7..648c40128 100644
--- a/openfisca_uk/parameters/demographic/equiv/bhc/child_under_14.yaml
+++ b/openfisca_uk/parameters/demographic/equiv/bhc/child_under_14.yaml
@@ -1,6 +1,5 @@
 description: Equivalisation factor for children under 14
 values:
-  2010-06-01:
-    value: 0.2
+  2010-06-01: 0.2
 metadata:
   unit: /1
diff --git a/openfisca_uk/parameters/demographic/equiv/bhc/first_adult.yaml b/openfisca_uk/parameters/demographic/equiv/bhc/first_adult.yaml
index 83d971215..d448838e8 100644
--- a/openfisca_uk/parameters/demographic/equiv/bhc/first_adult.yaml
+++ b/openfisca_uk/parameters/demographic/equiv/bhc/first_adult.yaml
@@ -1,6 +1,5 @@
 description: Equivalisation factor for the first adult
 values:
-  2010-06-01:
-    value: 0.67
+  2010-06-01: 0.67
 metadata:
   unit: /1
diff --git a/openfisca_uk/parameters/demographic/equiv/bhc/second_adult.yaml b/openfisca_uk/parameters/demographic/equiv/bhc/second_adult.yaml
index 44cf77fe4..ec5e6cb66 100644
--- a/openfisca_uk/parameters/demographic/equiv/bhc/second_adult.yaml
+++ b/openfisca_uk/parameters/demographic/equiv/bhc/second_adult.yaml
@@ -1,6 +1,5 @@
 description: Equivalisation factor for the second adult
 values:
-  2010-06-01:
-    value: 0.33
+  2010-06-01: 0.33
 metadata:
   unit: /1
diff --git a/openfisca_uk/parameters/poverty/absolute_poverty_threshold_ahc.yaml b/openfisca_uk/parameters/poverty/absolute_poverty_threshold_ahc.yaml
index aa70775b3..3a8b6ff87 100644
--- a/openfisca_uk/parameters/poverty/absolute_poverty_threshold_ahc.yaml
+++ b/openfisca_uk/parameters/poverty/absolute_poverty_threshold_ahc.yaml
@@ -1,7 +1,6 @@
-description: Absolute poverty threshold for equivalised household net income, after housing costs.
+description: Absolute poverty threshold for equivalised household net income, after housing costs
 values:
-  2010-01-01:
-    value: 215.4
+  2010-01-01: 215.4
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/poverty/absolute_poverty_threshold_bhc.yaml b/openfisca_uk/parameters/poverty/absolute_poverty_threshold_bhc.yaml
index e48a4b811..9a15fd866 100644
--- a/openfisca_uk/parameters/poverty/absolute_poverty_threshold_bhc.yaml
+++ b/openfisca_uk/parameters/poverty/absolute_poverty_threshold_bhc.yaml
@@ -1,7 +1,6 @@
-description: Absolute poverty threshold for equivalised household net income, before housing costs.
+description: Absolute poverty threshold for equivalised household net income, before housing costs
 values:
-  2010-01-01:
-    value: 251.4
+  2010-01-01: 251.4
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/default.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/default.yaml
index 08228cb76..647703677 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/default.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/default.yaml
@@ -1,7 +1,6 @@
-description: Annual allowance for relief on pension contributions.
+description: Annual allowance for relief on pension contributions
 values:
-  2015-06-01:
-    value: 40000
+  2015-06-01: 40_000
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/tax-on-your-private-pension/annual-allowance
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/minimum.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/minimum.yaml
index 7959688e8..2ae815e97 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/minimum.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/minimum.yaml
@@ -1,7 +1,6 @@
-description: Minimum annual allowance for relief on pension contributions.
+description: Minimum annual allowance for relief on pension contributions
 values:
-  2015-06-01:
-    value: 4000
+  2015-06-01: 4_000
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/guidance/pension-schemes-work-out-your-tapered-annual-allowance
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/reduction_rate.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/reduction_rate.yaml
index 936c54754..a803e5fe8 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/reduction_rate.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/reduction_rate.yaml
@@ -1,7 +1,6 @@
 description: Reduction rate for the annual allowance
 values:
-  2015-06-01:
-    value: 0.5
+  2015-06-01: 0.5
 metadata:
   unit: marginal-rate
   reference: https://www.gov.uk/tax-on-your-private-pension/annual-allowance
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/taper.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/taper.yaml
index 1c369c878..1e5c0b2f2 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/taper.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/annual_allowance/taper.yaml
@@ -1,7 +1,6 @@
 description: Adjusted net income limit for tapering of the annual allowance
 values:
-  2015-06-01:
-    value: 240000
+  2015-06-01: 240_000
 metadata:
   unit: currency-GBP
   reference: https://www.gov.uk/tax-on-your-private-pension/annual-allowance
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/dividend_allowance.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/dividend_allowance.yaml
index 4c8e5f216..ff9bf8d5d 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/dividend_allowance.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/dividend_allowance.yaml
@@ -1,7 +1,6 @@
 description: Amount of self-employment income untaxed per year
 values:
-  2015-06-05:
-    value: 2000
+  2015-06-05: 2_000
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/married_couples_allowance/deduction_rate.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/married_couples_allowance/deduction_rate.yaml
index 0016419a3..309473369 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/married_couples_allowance/deduction_rate.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/married_couples_allowance/deduction_rate.yaml
@@ -1,4 +1,4 @@
-description: Percentage of the Married Couple's Allowance which is deductible from Income Tax Liability.
+description: Percentage of the Married Couple's Allowance which is deductible from Income Tax Liability
 values:
   2010-01-01: 0.1
 metadata:
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/amount.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/amount.yaml
index 5fcb2473a..3a8934d5f 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/amount.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/amount.yaml
@@ -1,18 +1,12 @@
 description: The Personal Allowance is deducted from general income
 values:
-  2015-04-06:
-    value: 10600
+  2015-04-06: 10_600
   # TODO: Confirm date.
-  # 2015-04-06:
-  #   value: 11000
-  2017-04-06:
-    value: 11500
-  2018-04-06:
-    value: 11850
-  2019-04-06:
-    value: 12500
-  2021-04-06:
-    value: 12570
+  # 2015-04-06: 11000
+  2017-04-06: 11_500
+  2018-04-06: 11_850
+  2019-04-06: 12_500
+  2021-04-06: 12_570
 metadata:
   period: year
   name: personal_allowance
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/maximum_ANI.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/maximum_ANI.yaml
index e52d3d5a4..b7b68af69 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/maximum_ANI.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/maximum_ANI.yaml
@@ -1,8 +1,7 @@
-description: Maximum adjusted net income before the PA is reduced.
+description: Maximum adjusted net income before the Personal Allowance is reduced
 values:
-  2009-07-21:  # Date legislation passed. Is this when it was enacted?
-    value: 100000
+  # Date legislation passed. Is this when it was enacted?
+  2009-07-21: 100_000
 metadata:
   unit: currency-GBP
-  reference: https://www.legislation.gov.uk/ukpga/2007/3/part/3/chapter/2/crossheading/personal-allowances
-  
+  reference: https://www.legislation.gov.uk/ukpga/2007/3/part/3/chapter/2/crossheading/personal-allowances  
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/reduction_rate.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/reduction_rate.yaml
index 2bfaabb6e..6c191d476 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/reduction_rate.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/reduction_rate.yaml
@@ -1,8 +1,6 @@
 description: Reduction rate for the Personal Allowance
 values:
-  2009-07-21:
-    value: 0.5
+  2009-07-21: 0.5
 metadata:
   unit: /1
   reference: https://www.legislation.gov.uk/ukpga/2007/3/part/3/chapter/2/crossheading/personal-allowances/2009-07-21
-  
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/additional.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/additional.yaml
index 5b374e2ee..8e51acae7 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/additional.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/additional.yaml
@@ -1,7 +1,6 @@
 description: Savings allowance in the additional threshold
 values:
-  2005-06-01:
-    value: 0
+  2005-06-01: 0
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/basic.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/basic.yaml
index 83f4e6fa0..bd6624306 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/basic.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/basic.yaml
@@ -1,7 +1,6 @@
 description: Savings allowance in the basic threshold
 values:
-  2005-06-01:
-    value: 1000
+  2005-06-01: 1_000
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/higher.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/higher.yaml
index ecc6c8c14..e72218392 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/higher.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/higher.yaml
@@ -1,7 +1,6 @@
 description: Savings allowance in the higher threshold
 values:
-  2005-06-01:
-    value: 500
+  2005-06-01: 500
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/property_allowance.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/property_allowance.yaml
index 5ad4d0786..278bc75ae 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/property_allowance.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/property_allowance.yaml
@@ -1,7 +1,6 @@
 description: Amount of rental income untaxed per year
 values:
-  2005-06-01:
-    value: 1000
+  2005-06-01: 1_000
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/trading_allowance.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/trading_allowance.yaml
index 7c2d17ed5..96df79d6e 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/trading_allowance.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/trading_allowance.yaml
@@ -1,7 +1,6 @@
 description: Amount of self-employment income untaxed per year
 values:
-  2005-06-01:
-    value: 1000
+  2005-06-01: 1_000
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_end.yaml b/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_end.yaml
index 02d20a7d8..a6138b24d 100644
--- a/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_end.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_end.yaml
@@ -1,7 +1,6 @@
 description: Earnings after which the Child Benefit is fully phased out
 values:
-  2015-06-05:
-    value: 60000
+  2015-06-05: 60_000
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_start.yaml b/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_start.yaml
index 6c23cc9ed..b66cbb6d5 100644
--- a/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_start.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_start.yaml
@@ -1,7 +1,6 @@
 description: Earnings after which the Child Benefit phases out
 values:
-  2015-06-05:
-    value: 50000
+  2015-06-05: 50_000
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/dividends.yaml b/openfisca_uk/parameters/tax/income_tax/rates/dividends.yaml
index 8c4e7143b..c96421a88 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/dividends.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/dividends.yaml
@@ -9,12 +9,12 @@ brackets:
       2015-06-01: 0.325
       2022-04-01: 0.3375
     threshold:
-      2015-06-01: 37500
+      2015-06-01: 37_500
   - rate:
       2015-06-01: 0.381
       2022-04-01: 0.3935
     threshold:
-      2015-06-01: 150000
+      2015-06-01: 150_000
 metadata:
   period: year
   type: marginal_rate
@@ -24,4 +24,4 @@ metadata:
     - title: GOV.UK
       href: https://www.gov.uk/government/publications/rates-and-allowances-income-tax/income-tax-rates-and-allowances-current-and-past
     - title: Autumn Budget and Spending Review
-      href: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/1029973/Budget_AB2021_Print.pdf#page=138
\ No newline at end of file
+      href: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/1029973/Budget_AB2021_Print.pdf#page=138
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/savings_starter_rate/allowance.yaml b/openfisca_uk/parameters/tax/income_tax/rates/savings_starter_rate/allowance.yaml
index f3e77ad69..6c1a83065 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/savings_starter_rate/allowance.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/savings_starter_rate/allowance.yaml
@@ -1,6 +1,6 @@
 description: Starter allowance for savings
 values:
-  2010-06-01: 5000
+  2010-06-01: 5_000
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/scotland/post_starter_rate.yaml b/openfisca_uk/parameters/tax/income_tax/rates/scotland/post_starter_rate.yaml
index 768f5461c..2ce9bd1dc 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/scotland/post_starter_rate.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/scotland/post_starter_rate.yaml
@@ -1,7 +1,7 @@
-description: Income tax scale for Scotland
+description: Income Tax scale for Scotland
 brackets:
   - rate:
-      description: The starter rate applies in Scotland and is the first Income Tax rate.
+      description: The starter rate applies in Scotland and is the first Income Tax rate
       values:
         2018-06-01: 0.19
       metadata:
@@ -11,7 +11,7 @@ brackets:
     threshold:
       2018-06-01: 0
   - rate:
-      description: The Scottish basic rate is similar to the UK basic rate, but operates over a smaller region of income.
+      description: The Scottish basic rate is similar to the UK basic rate, but operates over a smaller region of income
       values:
         2018-06-01: 0.2
       metadata:
@@ -19,18 +19,18 @@ brackets:
         name: scottish_basic_rate
         unit: /1
     threshold:
-      description: The threshold at which an individual pays the basic rate.
+      description: The threshold at which an individual pays the basic rate
       values:
-        2018-06-01: 2000
-        2019-06-01: 2049
-        2020-06-01: 2085
+        2018-06-01: 2_000
+        2019-06-01: 2_049
+        2020-06-01: 2_085
       metadata:
         label: Scottish basic rate threshold
         name: scottish_basic_threshold
         unit: currency-GBP
         period: year
   - rate:
-      description: The third rate in Scottish Income Tax.
+      description: The third rate in Scottish Income Tax
       values:
         2018-06-01: 0.21
       metadata:
@@ -38,18 +38,18 @@ brackets:
         name: scottish_intermediate_rate
         unit: /1
     threshold:
-      description: The threshold at which an individual pays the Scottish intermediate rate.
+      description: The threshold at which an individual pays the Scottish intermediate rate
       values:
-        2018-06-01: 12150
-        2020-06-01: 12444
-        2021-06-01: 12658
+        2018-06-01: 12_150
+        2020-06-01: 12_444
+        2021-06-01: 12_658
       metadata:
         label: Scottish intermediate rate threshold
         name: scottish_intermediate_threshold
         unit: currency-GBP
         period: year
   - rate:
-      description: The fourth rate in Scottish Income Tax.
+      description: The fourth rate in Scottish Income Tax
       values:
         2018-06-01: 0.4
       metadata:
@@ -57,18 +57,18 @@ brackets:
         name: scottish_higher_rate
         unit: /1
     threshold:
-      description: The threshold at which an individual pays the Scottish higher rate.
+      description: The threshold at which an individual pays the Scottish higher rate
       values:
-        2018-06-01: 31580
-        2019-06-01: 30930
-        2020-06-01: 30930
+        2018-06-01: 31_580
+        2019-06-01: 30_930
+        2020-06-01: 30_930
       metadata:
         label: Scottish higher rate threshold
         name: scottish_higher_threshold
         unit: currency-GBP
         period: year
   - rate:
-      description: The fifth and final rate in Scottish Income Tax.
+      description: The fifth and final rate in Scottish Income Tax
       values:
         2018-06-01: 0.46
       metadata:
@@ -76,9 +76,9 @@ brackets:
         name: scottish_additional_rate
         unit: /1
     threshold:
-      description: The threshold at which an individual pays the Scottish additional rate.
+      description: The threshold at which an individual pays the Scottish additional rate
       values:
-        2018-06-01: 150000
+        2018-06-01: 150_000
       metadata:
         label: Scottish additional rate threshold
         name: scottish_add_threshold
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/scotland/pre_starter_rate.yaml b/openfisca_uk/parameters/tax/income_tax/rates/scotland/pre_starter_rate.yaml
index 53936985d..e775f8bc9 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/scotland/pre_starter_rate.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/scotland/pre_starter_rate.yaml
@@ -1,4 +1,4 @@
-description: Income tax scale for Scotland
+description: Income Tax scale for Scotland
 brackets:
   - rate:
       2010-06-01: 0.2
@@ -7,13 +7,13 @@ brackets:
   - rate:
       2015-06-01: 0.4
     threshold:
-      2015-06-01: 31785
-      2015-06-05: 32000
-      2017-06-01: 31500
+      2015-06-01: 31_785
+      2015-06-05: 32_000
+      2017-06-01: 31_500
   - rate:
       2010-06-01: 0.45
     threshold:
-      2015-06-05: 150000
+      2015-06-05: 150_000
 metadata:
   period: year
   type: marginal_rate
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/uk.yaml b/openfisca_uk/parameters/tax/income_tax/rates/uk.yaml
index 7e6781ae3..850cecd2a 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/uk.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/uk.yaml
@@ -1,7 +1,7 @@
-description: Income tax scale
+description: Income Tax scale
 brackets:
   - rate:
-      description: The basic rate is the first of three tax brackets on all income, after allowances are deducted.
+      description: The basic rate is the first of three tax brackets on all income, after allowances are deducted
       values:
         2015-06-01: 0.2
       metadata:
@@ -21,21 +21,21 @@ brackets:
         name: higher_rate
         unit: /1
     threshold:
-      description: The lower threshold for the higher rate of income tax (and therefore the upper threshold of the basic rate).
+      description: The lower threshold for the higher rate of income tax (and therefore the upper threshold of the basic rate)
       values:
-        2015-06-05: 32_000.00
-        2017-06-01: 33_500.00
-        2018-06-01: 34_500.00
-        2019-06-01: 37_500.00
-        2020-06-01: 37_500.00
-        2021-06-01: 37_700.00
+        2015-06-05: 32_000
+        2017-06-01: 33_500
+        2018-06-01: 34_500
+        2019-06-01: 37_500
+        2020-06-01: 37_500
+        2021-06-01: 37_700
       metadata:
         label: Higher rate threshold
         name: higher_threshold
         unit: currency-GBP
         period: year
   - rate:
-      description: The additional rate is the highest tax bracket, with no upper bound.
+      description: The additional rate is the highest tax bracket, with no upper bound
       values:
         2015-06-05: 0.45
       metadata:
@@ -45,9 +45,9 @@ brackets:
         tests:
           - decreases_net_income: true
     threshold:
-      description: The lower threshold for the additional rate.
+      description: The lower threshold for the additional rate
       values:
-        2015-06-05: 150000.00
+        2015-06-05: 150_000
       metadata:
         label: Additional rate threshold
         name: add_threshold
diff --git a/openfisca_uk/parameters/tax/income_tax/reliefs/pension_contribution/basic_amount.yaml b/openfisca_uk/parameters/tax/income_tax/reliefs/pension_contribution/basic_amount.yaml
index 10e6e1a73..efd31cbf3 100644
--- a/openfisca_uk/parameters/tax/income_tax/reliefs/pension_contribution/basic_amount.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/reliefs/pension_contribution/basic_amount.yaml
@@ -1,6 +1,6 @@
 description: The 'basic amount' - the maximum amount of tax relief from pension contributions
 values:
-  2004-07-22: 3600.00
+  2004-07-22: 3_600
 metadata:
   unit: currency-GBP
   reference: Finance Act 2004 s. 190(4)
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employee/additional.yaml b/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employee/additional.yaml
index 000dde898..af8ec4cb3 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employee/additional.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employee/additional.yaml
@@ -1,8 +1,8 @@
-description: The Class 1 NI additional rate is paid on employment earnings above the Upper Earnings Limit
+description: The Class 1 National Insurance additional rate is paid on employment earnings above the Upper Earnings Limit
 values:
   2015-06-01: 0.02
 metadata:
-  label: NI additional rate
+  label: National Insurance additional rate
   name: NI_add_rate
   unit: /1
   reference: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employee/main.yaml b/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employee/main.yaml
index f3fb10295..377befc81 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employee/main.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employee/main.yaml
@@ -1,8 +1,8 @@
-description: The Class 1 NI main rate is paid on employment earnings between the Primary Threshold and the Upper Earnings Limit
+description: The Class 1 National Insurance main rate is paid on employment earnings between the Primary Threshold and the Upper Earnings Limit
 values:
   2015-06-01: 0.12
 metadata:
-  label: NI main rate
+  label: National Insurance main rate
   name: NI_main_rate
   unit: /1
   reference: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employer.yaml b/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employer.yaml
index f4e2aeccb..e96096f12 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employer.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_1/rates/employer.yaml
@@ -1,4 +1,4 @@
-description: Contribution rate by employers (on earnings above the ST)
+description: National Insurance contribution rate by employers on earnings above the Secondary Threshold
 values:
   2015-06-01: 0.138
 metadata:
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/lower_earnings_limit.yaml b/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/lower_earnings_limit.yaml
index 3200fe2f4..fc764a349 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/lower_earnings_limit.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/lower_earnings_limit.yaml
@@ -1,17 +1,11 @@
 description: Lower earnings limit for National Insurance
 values:
-  2015-04-06:
-    value: 112
-  2016-04-06:
-    value: 112
-  2017-04-06:
-    value: 113
-  2018-04-06:
-    value: 116
-  2019-04-06:
-    value: 118
-  2020-04-06:
-    value: 120
+  2015-04-06: 112
+  2016-04-06: 112
+  2017-04-06: 113
+  2018-04-06: 116
+  2019-04-06: 118
+  2020-04-06: 120
 metadata:
   unit: currency-GBP
   period: week
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/primary_threshold.yaml b/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/primary_threshold.yaml
index 09627d761..96626ca61 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/primary_threshold.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/primary_threshold.yaml
@@ -1,4 +1,4 @@
-description: The Primary Threshold is the lower bound for the main rate of Class 1 NI
+description: The Primary Threshold is the lower bound for the main rate of Class 1 National Insurance
 values:
   2015-04-06: 155
   2016-04-06: 155
@@ -8,7 +8,7 @@ values:
   2020-04-06: 183
   2021-04-06: 184
 metadata:
-  label: NI Primary Threshold
+  label: National Insurance Primary Threshold
   name: NI_PT
   unit: currency-GBP
   period: week
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/secondary_threshold.yaml b/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/secondary_threshold.yaml
index 6dfcbb3bb..6fef5df1f 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/secondary_threshold.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/secondary_threshold.yaml
@@ -1,19 +1,12 @@
-description: Primary threshold for National Insurance
+description: Secondary threshold for National Insurance
 values:
-  2015-04-06:
-    value: 155
-  2016-04-06:
-    value: 155
-  2017-04-06:
-    value: 157
-  2018-04-06:
-    value: 162
-  2019-04-06:
-    value: 166
-  2020-04-06:
-    value: 169
-  2021-04-06:
-    value: 170
+  2015-04-06: 155
+  2016-04-06: 155
+  2017-04-06: 157
+  2018-04-06: 162
+  2019-04-06: 166
+  2020-04-06: 169
+  2021-04-06: 170
 metadata:
   unit: currency-GBP
   period: week
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/upper_earnings_limit.yaml b/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/upper_earnings_limit.yaml
index 39f4699b0..455df097e 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/upper_earnings_limit.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_1/thresholds/upper_earnings_limit.yaml
@@ -1,4 +1,4 @@
-description: The Upper Earnings Limit is the upper bound for the main rate of Class 1 NI
+description: The Upper Earnings Limit is the upper bound for the main rate of Class 1 National Insurance
 values:
   2015-04-06: 815
   2016-04-06: 827
@@ -8,7 +8,7 @@ values:
   2020-04-06: 962
   2021-04-06: 966.73
 metadata:
-  label: NI Upper Earnings Limit
+  label: National Insurance Upper Earnings Limit
   name: NI_UEL
   unit: currency-GBP
   period: week
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_2/flat_rate.yaml b/openfisca_uk/parameters/tax/national_insurance/class_2/flat_rate.yaml
index 094458412..903417bb6 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_2/flat_rate.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_2/flat_rate.yaml
@@ -1,18 +1,12 @@
-description: Flat rate contribution for self-employed earners
+description: Flat rate National Insurance contribution for self-employed earners
 values:
-  2015-06-01:
-    value: 2.80
-  2017-06-01:
-    value: 2.85
-  2018-06-01:
-    value: 2.95
-  2019-06-01:
-    value: 3.00
-  2020-06-01:
-    value: 3.05
+  2015-06-01: 2.80
+  2017-06-01: 2.85
+  2018-06-01: 2.95
+  2019-06-01: 3.00
+  2020-06-01: 3.05
 metadata:
   unit: currency-GBP
   reference:
   - https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
   - https://www.gov.uk/government/publications/rates-and-allowances-national-insurance-contributions/rates-and-allowances-national-insurance-contributions
-  
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_2/small_profits_threshold.yaml b/openfisca_uk/parameters/tax/national_insurance/class_2/small_profits_threshold.yaml
index 73042896d..5b8ccfef5 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_2/small_profits_threshold.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_2/small_profits_threshold.yaml
@@ -1,17 +1,11 @@
-description: Small profits threshold for self-employed earners
+description: Small profits National Insurance threshold for self-employed earners
 values:
-  2015-04-06:
-    value: 3965
-  2017-04-06:
-    value: 6025
-  2018-04-06:
-    value: 6205
-  2019-04-06:
-    value: 6365
-  2020-04-06:
-    value: 6475
-  2021-04-06:
-    value: 6515
+  2015-04-06: 3_965
+  2017-04-06: 6_025
+  2018-04-06: 6_205
+  2019-04-06: 6_365
+  2020-04-06: 6_475
+  2021-04-06: 6_515
 metadata:
   unit: currency-GBP
   reference:
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_4/rates/additional.yaml b/openfisca_uk/parameters/tax/national_insurance/class_4/rates/additional.yaml
index b46ec2182..25c640b65 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_4/rates/additional.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_4/rates/additional.yaml
@@ -1,8 +1,8 @@
-description: The additional rate paid above the Upper Profits Limit for self-employed profits
+description: The additional National Insurance rate paid above the Upper Profits Limit for self-employed profits
 values:
   2015-06-01: 0.02
 metadata:
-  label: NI Class 4 additional rate
+  label: National Insurance Class 4 additional rate
   name: NI_class_4_add_rate
   unit: /1
   reference: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_4/rates/main.yaml b/openfisca_uk/parameters/tax/national_insurance/class_4/rates/main.yaml
index 9c25718b7..19d62d939 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_4/rates/main.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_4/rates/main.yaml
@@ -1,8 +1,8 @@
-description: The main rate paid between the Lower and Upper Profits Limits for self-employed profits
+description: The main National Insurance rate paid between the Lower and Upper Profits Limits for self-employed profits
 values:
   2015-06-01: 0.09
 metadata:
-  label: NI Class 4 main rate
+  label: National Insurance Class 4 main rate
   name: NI_class_4_main_rate
   unit: /1
   reference: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_4/thresholds/lower_profits_limit.yaml b/openfisca_uk/parameters/tax/national_insurance/class_4/thresholds/lower_profits_limit.yaml
index dca0e72b7..f18c7db13 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_4/thresholds/lower_profits_limit.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_4/thresholds/lower_profits_limit.yaml
@@ -7,7 +7,7 @@ values:
   2020-04-06: 9_500
   2021-04-06: 9_568
 metadata:
-  label: NI Lower Profits Limit
+  label: National Insurance Lower Profits Limit
   name: NI_LPL
   unit: currency-GBP
   period: year
diff --git a/openfisca_uk/parameters/tax/national_insurance/class_4/thresholds/upper_profits_limit.yaml b/openfisca_uk/parameters/tax/national_insurance/class_4/thresholds/upper_profits_limit.yaml
index c0cc6da5e..83b8552dc 100644
--- a/openfisca_uk/parameters/tax/national_insurance/class_4/thresholds/upper_profits_limit.yaml
+++ b/openfisca_uk/parameters/tax/national_insurance/class_4/thresholds/upper_profits_limit.yaml
@@ -1,4 +1,4 @@
-description: The Upper Profits Limit is the threshold at which self-employed earners pay the additional Class 4 rate
+description: The Upper Profits Limit is the threshold at which self-employed earners pay the additional Class 4 National Insurance rate
 values:
   2015-04-06: 42_386
   2015-06-05: 43_000
@@ -8,7 +8,7 @@ values:
   2020-04-06: 50_000
   2021-04-06: 50_270
 metadata:
-  label: NI Upper Profits Limit
+  label: National Insurance Upper Profits Limit
   name: NI_UPL
   unit: currency-GBP
   period: year
diff --git a/openfisca_uk/parameters/uprating/CPI.yaml b/openfisca_uk/parameters/uprating/CPI.yaml
index afde1c30a..765daa015 100644
--- a/openfisca_uk/parameters/uprating/CPI.yaml
+++ b/openfisca_uk/parameters/uprating/CPI.yaml
@@ -1,4 +1,4 @@
-description: Harmonised CPI index
+description: Harmonised Consumer Price Index
 values:
   2010-01-01: 90.1
   2011-01-01: 93.6
diff --git a/openfisca_uk/parameters/uprating/council_tax.yaml b/openfisca_uk/parameters/uprating/council_tax.yaml
index 4f351ebde..3d03d847a 100644
--- a/openfisca_uk/parameters/uprating/council_tax.yaml
+++ b/openfisca_uk/parameters/uprating/council_tax.yaml
@@ -1,15 +1,15 @@
 description: Council Tax uprating
 values:
-  2018-01-01: 1671.00
-  2019-01-01: 1750.00
-  2020-01-01: 1812.00
-  2021-01-01: 1847.00
-  2021-04-01: 1855.75
-  2021-07-01: 1864.50
-  2021-10-01: 1873.25
-  2022-01-01: 1882.00
-  2023-01-01: 1918.00
-  2024-01-01: 1954.00
+  2018-01-01: 1_671.00
+  2019-01-01: 1_750.00
+  2020-01-01: 1_812.00
+  2021-01-01: 1_847.00
+  2021-04-01: 1_855.75
+  2021-07-01: 1_864.50
+  2021-10-01: 1_873.25
+  2022-01-01: 1_882.00
+  2023-01-01: 1_918.00
+  2024-01-01: 1_954.00
 metadata:
   unit: currency-GBP
   reference: https://www.microsimulation.ac.uk/wp-content/uploads/2020/10/cempa7-20.pdf#page=109
diff --git a/setup.py b/setup.py
index af3ded6d6..a805e5da7 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name="OpenFisca-UK",
-    version="0.7.9",
+    version="0.7.10",
     author="PolicyEngine",
     author_email="nikhil@policyengine.org",
     classifiers=[


Test patch:
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/earn_disregard.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/earn_disregard.yaml
index 24402f1a3..5be069126 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/earn_disregard.yaml
@@ -1,7 +1,6 @@
 description: Threshold earnings, above which the Housing Benefit (LHA) is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_couple.yaml
index 5a343c4dd..03645925d 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_couple.yaml
@@ -1,7 +1,6 @@
 description: Threshold in income for a couple, above which the Housing Benefit (LHA) amount is reduced
 values:
-  2015-06-01:
-    value: 10.00
+  2015-06-01: 10.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone.yaml
index d9ba3805f..b454d80b3 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone.yaml
@@ -1,7 +1,6 @@
 description: Threshold in income for a lone parent, above which the Housing Benefit (LHA) amount is reduced
 values:
-  2015-06-01:
-    value: 20.00
+  2015-06-01: 20.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone_parent.yaml
index 96e99e794..b454d80b3 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone_parent.yaml
@@ -1,7 +1,6 @@
-description: Threshold in income for a lone parent, above which the  Housing Benefit (LHA) amount is reduced
+description: Threshold in income for a lone parent, above which the Housing Benefit (LHA) amount is reduced
 values:
-  2015-06-01:
-    value: 20.00
+  2015-06-01: 20.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_single.yaml
index 18df8edf4..06414629b 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_single.yaml
@@ -1,7 +1,6 @@
 description: Threshold in income for a single person, above which the Housing Benefit (LHA) amount is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/withdrawal_rate.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/withdrawal_rate.yaml
index 28629ca52..0e81ec43b 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/withdrawal_rate.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/withdrawal_rate.yaml
@@ -1,7 +1,6 @@
 description: Withdrawal rate of Housing Benefit (LHA)
 values:
-  2015-06-01:
-    value: 0.65
+  2015-06-01: 0.65
 metadata:
   period: week
   unit: /1
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/worker_hours.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/worker_hours.yaml
index dc377e2ed..96b81ee8e 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/worker_hours.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/worker_hours.yaml
@@ -1,7 +1,6 @@
-description: Default hours requirement for the WTC-related worker element of Housing Benefit (LHA)
+description: Default hours requirement for the Working-Tax-Credit-related worker element of Housing Benefit (LHA)
 values:
-  2015-06-01:
-    value: 30
+  2015-06-01: 30
 metadata:
   period: week
   unit: hour
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/worker_income_disregard.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/worker_income_disregard.yaml
index 92675fd41..88e8e7b1a 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/worker_income_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/worker_income_disregard.yaml
@@ -1,7 +1,6 @@
 description: Additional disregard in income for meeting the 16/30 hours requirement
 values:
-  2015-06-01:
-    value: 30
+  2015-06-01: 30
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/earn_disregard.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/earn_disregard.yaml
index 86f35795f..e327e1431 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/earn_disregard.yaml
@@ -1,7 +1,6 @@
 description: Threshold for earnings, above which Housing Benefit is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_couple.yaml
index 2e89ea09c..7dfeaa5c4 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_couple.yaml
@@ -1,7 +1,6 @@
 description: Threshold for income for a couple, above which Housing Benefit is reduced
 values:
-  2015-06-01:
-    value: 10.00
+  2015-06-01: 10.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_lone_parent.yaml
index 797087efb..22c2387b0 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_lone_parent.yaml
@@ -1,7 +1,6 @@
 description: Threshold in income for a lone parent, above which the Housing Benefit is reduced
 values:
-  2015-06-01:
-    value: 25.00
+  2015-06-01: 25.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_single.yaml
index 39ed7df43..ff58f4ac0 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_single.yaml
@@ -1,7 +1,6 @@
 description: Threshold in income for a single person, above which Housing Benefit is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/pension_disregard.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/pension_disregard.yaml
index 628d01a7b..18790f28b 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/pension_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/pension_disregard.yaml
@@ -1,7 +1,6 @@
 description: Threshold in occupational and personal pensions, above which Housing Benefit is reduced
 values:
-  2015-06-01:
-    value: 50.00
+  2015-06-01: 50.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/withdrawal_rate.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/withdrawal_rate.yaml
index e5090865c..222c9bc21 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/withdrawal_rate.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/withdrawal_rate.yaml
@@ -1,7 +1,6 @@
 description: Withdrawal rate of Housing Benefit
 values:
-  2015-06-01:
-    value: 0.65
+  2015-06-01: 0.65
 metadata:
   unit: /1
   reference: http://www.oecd.org/els/soc/TaxBEN-United-Kingdom-2018.pdf#page=13
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_hours.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_hours.yaml
index 772cfceed..b24516bea 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_hours.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_hours.yaml
@@ -1,7 +1,6 @@
-description: Default hours requirement for the WTC-hours-related element of Housing Benefit
+description: Default hours requirement for the Working-Tax-Credit-hours-related element of Housing Benefit
 values:
-  2015-06-01:
-    value: 30.00
+  2015-06-01: 30.00
 metadata:
   period: week
   unit: hour
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_income_disregard.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_income_disregard.yaml
index 7363805bf..973730d63 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_income_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_income_disregard.yaml
@@ -1,7 +1,6 @@
 description: Additional disregard in income for meeting the 16/30 hours requirement for Housing Benefit
 values:
-  2015-06-01:
-    value: 37.10
+  2015-06-01: 37.10
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/earn_disregard.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/earn_disregard.yaml
index d5040427d..f762e50ac 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/earn_disregard.yaml
@@ -1,7 +1,6 @@
 description: Threshold in earnings, above which the Income Support amount is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_couple.yaml
index d972dbd6c..b60b5001d 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_couple.yaml
@@ -1,7 +1,6 @@
 description: Threshold in income for a couple, above which the Income Support amount is reduced
 values:
-  2015-06-01:
-    value: 10.00
+  2015-06-01: 10.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_lone_parent.yaml
index 0701c6242..942b86666 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_lone_parent.yaml
@@ -1,7 +1,6 @@
 description: Threshold in income for a lone parent, above which the Income Support amount is reduced
 values:
-  2015-06-01:
-    value: 20.00
+  2015-06-01: 20.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_single.yaml
index 0b6ef5b6c..00a70f0d1 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_single.yaml
@@ -1,7 +1,6 @@
 description: Threshold in income for a single person, above which the Income Support amount is reduced
 values:
-  2015-06-01:
-    value: 5.00
+  2015-06-01: 5.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/pension_disregard.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/pension_disregard.yaml
index 06af98e98..80e45a38e 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/pension_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/pension_disregard.yaml
@@ -1,7 +1,6 @@
 description: Threshold in occupational and personal pensions, above which the Income Support amount is reduced
 values:
-  2015-06-01:
-    value: 50.00
+  2015-06-01: 50.00
 metadata:
   period: week
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_reduction_rate.yaml b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_reduction_rate.yaml
index fede25a13..c8c13b5f7 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_reduction_rate.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_reduction_rate.yaml
@@ -1,7 +1,6 @@
 description: Rate after income threshold reached by which Child Tax Credit is reduced per £1.
 values:
-  2016-04-07:
-    value: 0.41
+  2016-04-07: 0.41
 metadata:
   unit: /1
   reference:
diff --git a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold.yaml b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold.yaml
index d1a0c075c..c63c179f5 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold.yaml
@@ -1,12 +1,9 @@
-description: Yearly income threshold after which the Child Tax Credit is reduced for benefit units claiming Working Tax Credit.
+description: Yearly income threshold after which the Child Tax Credit is reduced for benefit units claiming Working Tax Credit
 values:
-  2016-04-06:
-    value: 6420
-  2020-04-06:
-    # NB: EUROMOD reports 6555. This is the gov.uk value.
-    value: 6530
-  2021-04-06:
-    value: 6565
+  2016-04-06: 6_420
+  # NB: EUROMOD reports 6_555 for 2020. This is the gov.uk value.
+  2020-04-06: 6_530
+  2021-04-06: 6_565
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold_CTC_only.yaml b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold_CTC_only.yaml
index abb8d918d..05868cdf1 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold_CTC_only.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold_CTC_only.yaml
@@ -1,12 +1,9 @@
 description: Income threshold for benefit units only entitled to Child Tax Credit
 values:
-  2016-04-06:
-    value: 16105
-  2020-04-06:
-    # NB: EUROMOD reports 16435. This is the gov.uk value.
-    value: 16385
-  2021-04-06:
-    value: 16480
+  2016-04-06: 16_105
+  # NB: EUROMOD reports 16_435 for 2020. This is the gov.uk value.
+  2020-04-06: 16_385
+  2021-04-06: 16_480
 metadata:
   period: year
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/tax_credits/means_test/non_earned_disregard.yaml b/openfisca_uk/parameters/benefit/tax_credits/means_test/non_earned_disregard.yaml
index d622554bf..2f524ac60 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/means_test/non_earned_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/means_test/non_earned_disregard.yaml
@@ -1,7 +1,6 @@
 description: Amount of income from non-earned sources disregarded in the tax credit income test
 values:
-  2002-06-01:
-    value: 300
+  2002-06-01: 300
 metadata:
   unit: currency-GBP
   reference: The Tax Credits (Definition and Calculation of Income) Regulations 2002 s. 3
diff --git a/openfisca_uk/parameters/benefit/universal_credit/means_test/reduction_rate.yaml b/openfisca_uk/parameters/benefit/universal_credit/means_test/reduction_rate.yaml
index 60b81b7d2..3eff283b3 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/means_test/reduction_rate.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/means_test/reduction_rate.yaml
@@ -6,7 +6,7 @@ values:
   # Autumn Budget and Spending Review 2021.
   2021-12-01: 0.55
 metadata:
-  label: UC reduction rate
+  label: Universal Credit reduction rate
   name: UC_reduction_rate
   unit: /1
   reference:
diff --git a/openfisca_uk/parameters/benefit/universal_credit/means_test/work_allowance_with_housing.yaml b/openfisca_uk/parameters/benefit/universal_credit/means_test/work_allowance_with_housing.yaml
index ab861f12f..32078b0bb 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/means_test/work_allowance_with_housing.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/means_test/work_allowance_with_housing.yaml
@@ -9,7 +9,7 @@ values:
   # Autumn Budget and Spending Review 2021 increases work allowance by £50.
   2021-12-01: 335
 metadata:
-  label: UC Work Allowance with housing support
+  label: Universal Credit Work Allowance with housing support
   name: UC_work_allowance_with_housing
   period: month
   unit: currency-GBP
diff --git a/openfisca_uk/parameters/benefit/universal_credit/means_test/work_allowance_without_housing.yaml b/openfisca_uk/parameters/benefit/universal_credit/means_test/work_allowance_without_housing.yaml
index 79fa8b004..4a0d09bdf 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/means_test/work_allowance_without_housing.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/means_test/work_allowance_without_housing.yaml
@@ -9,7 +9,7 @@ values:
   # Autumn Budget and Spending Review 2021 increases work allowance by £50.
   2021-12-01: 557
 metadata:
-  label: UC Work Allowance without housing support
+  label: Universal Credit Work Allowance without housing support
   name: UC_work_allowance_without_housing
   period: month
   unit: currency-GBP