Misc readability fixes/tweaks