Fix comments and placement of some lines.