Refactoring to match especifications of passengers