Minor readability-only changes