email: Additional tidy up of comments following recent changes