Better readability fixes