Fixing coding convention
Removed variable

Remove the emailAddress variable, and replaced old dataobject method
with new type
remove debugging code
fixed up code conventions