1) Simple readability fixes