removing passenger option and changing it to a generic action parameter
reformatted code to meet pep8 style guide