Readability fixes.
More readability fixes.