look more like 4.2 designs
Merge pull request #15 from ministryofjustice/some-cleaning-up

look more like 4.2 designs