Clean up some more comments, Ticket0718