Various readability/doc/convention improvements