Comment and spacing fixes