Refactored reporting

Changes to constructors and method used