Cleanup

Would it be easy to add a simple test or two for this function for various emails?