Refactored week stat