continued readability fixes