Fixing some comments and spacing