Slight readability/doc improvements