Reorganize logic, change email message to sound less robotic