drop useless "__" from variable names
cleaner code
new proper code, that is now working as I fixed bad OSM data
consistent coding style