Address Format

First thing…this is an awesome plugin, thank you for your hard work.
I have an issue with some of the addresses formatted address showing the city, state and zip code on separate lines like this (actual city, state and zip code removed):

city
state
zip code

I would like all addresses to show up like this:

city, state zip code

This does not happen on all invoices and that’s what has me puzzled as to why the plugin is doing this.
Would you have a solution for me?
Thank you!