Do you place a comma after the street name and before the city and state?

What is the proper way to type contact information A. 123 Sample Street, Nowhere, US 54321 or B. 123 Sample Street Nowhere, US 54321