Change zip code lookup to support any 6858 code & combine if statements