Refactored to use @jordan-wright email package