Removing duplication for Code Climate
further refactoring
Merge pull request #431 from ministryofjustice/remove-duplication

Removing duplication for Code Climate