Fixes some review comments from @irm-codebase in #390.
Made a specific PR as they are changes that are worth considering in isolation, I believe. Deals with data units, mostly.
I'll deal with the rest of the review comments in #390 directly.
Checklist
Any checks which are not relevant to the PR can be pre-checked by the PR creator. All others should be checked by the reviewer. You can add extra checklist items here if required by the PR.
Fixes some review comments from @irm-codebase in #390.
Made a specific PR as they are changes that are worth considering in isolation, I believe. Deals with data units, mostly.
I'll deal with the rest of the review comments in #390 directly.
Checklist
Any checks which are not relevant to the PR can be pre-checked by the PR creator. All others should be checked by the reviewer. You can add extra checklist items here if required by the PR.