report_format change and PEP8 formatting