Small code refactoring
Small code refactoring


Former-commit-id: f5b4fe7425a97b12b80fef78d0621b5da29a39a2
DenisCarriere/geocoder,akittas/geocoder,minimedj/geocoder,ahlusar1989/geocoder,miraculixx/geocoder,epyatopal/geocoder-1