Made getPlaceDataProvider non-static and fixed side effects thereof
Formatting cleanup