Smartanswers: overseas passports - code tidy up

https://www.pivotaltracker.com/story/show/67225622