Cleanup. Renamed tipCalc