more readability fixes