Update e-mail.
Some cleanups.