code cleanup
email and number templates