Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Thomas Leese <5f50a84c1fa3bcff146405017f36aec1a10a9e38@leese.io>
alphagov/whitehall,alphagov/whitehall,alphagov/whitehall,alphagov/whitehall