refactoring + fix + update on report