Refactored report