refactored trip state and common trip options