Code readability fixes.