Refactor to allow separate generation/transmission of notices