Some street refactoring