Some refactorings etc
Merge pull request #27 from ministryofjustice/claimant-fixes

Claimant fixes merge into changing models