fix parts of the code discussed at https://github.com/geopy/geopy/pull/96#discussion_r22366796