Small style + readability fixes.