Adjust comments and spacing (use spaces)