What is the version of the following sentence with correct punctuation?

Wouldnt it have been inconvenient to have to specify Boston Oregon or Boston Massachusetts Portland Maine comes up so infrequently that people know Portland almost always refers to Portland Oregon
Wouldn't it have been inconvenient to have to specify Boston, Oregon or Boston, Massachusetts? Portland, Maine comes up so infrequently that people know Portland almost always refers to Portland, Oregon.