Fix smells

- Fix "Complex code in ClaimPresenter definition outside of methods"
- DRY up EmploymentPresenter
Merge pull request #48 from ministryofjustice/assuage-code-climate

Assuage code climate