adding comma before zip code, plus some refactoring