cleaned up email options