fixup! report: Refactor: Declare columns in the code rather than in the template