df: rename percentage types to a more generic name
df: remove trailing whitespaces