Improve reeadability of reports table code