Refactor passport code