added email, cleaned up