cleanup: add headers, descriptions