readability fixes and such