Use less variable for travel distance

Change-Id: Ib2dab3a5d3a4daa0ce7a86db6213a0342446962a
Merge "Use less variable for travel distance"