report refactored