Adjusted NPM passenger to #23
Tiny Refactoring of NPM Passenger