Minor cleanup
Import from OpenStreetMap works somewhat