Reporting #2

Additional changes (formatting)