Refactored code to make it more readable
Updated email