some lines reformated