formatting some lines
Merge branch 'formatting'