cleaned up email stuff