Refactored street duplicate checking