Make convenience section clearer