refactored reporting app