Refactor newsletter