Hi, thanks for your contribution! Since you requested a review, I looked over your changes. Since you included lots of unrelated changes, it's a little hard for me to be completely sure, but I don't see any issues. Thanks again and happy mapping!