Fix spacing and unwanted line breaks