Remove unneeded parameter
Change scope name
Refactor report creation