More readability fixes