Addressing final minor comments from location PR

[tumbleshack]

The final changes that @aschleck requested.

Sorry @xunhuang , intended to address those last comments but didn't get a chance yesterday.

[xunhuang]

thank you for your hardwork!