Mailing List Code Refactor