Refactored passport-code to single file.