First pass refactoring of passenger class