Chore: cleaned up the layout of the functions in the reports to make them easier to understand and follow standard practices