Send the weekly email + minor refactoring