refactored and removed duplicate reporting