Refactoring in preparation for adding mailing list form