minor passport refactor