Lots of readability fixes