add __email__
comment cleanup