fix bug with line breaks
some cosmetic changes