More readability fixes.