refactoring passport initialization