Tweaked some comments and spacing