Added some more partitioning of code in report