Fix smells

- Fix "Complex code in ClaimPresenter definition outside of methods"
- DRY up EmploymentPresenter