code clean up
email