Fix code duplication
Merge branch 'master' of github.com:iHiD/dvla