Readability fixes