Remove leading '?' from query_string
Add some explanatory comments to fare calculation routine