small refactor, street localization WIP