Refactor the way street suffixes were returned