Refactoring to comply with v0.5.0
Clarifying displayed data in report