Smartanswers - Overseas passports - code refactor

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