Better paragraph handling