Some readability fixes.