Refactor average logic to not include today's count.