Some suggestions and some reindenting