Refactored weekly email