Some cleanup + added Subject in email