Refactor: Reorganised report logging.