Well now already upfront fare. You can throw all those formula away. Only thing is when you received ping, you will see what is the surge rate for that request. Then when rider on board, you can ask what is the upfront rate. Use that fare and divide with the surge rate you received. So you will get to know what is the fare without surge. Good luck.