Tidying up our email addresses