refactoring emails/services