Refactoring email format