A few comments and lots of reindenting