Re-arrange report & remove email attribute
Cosmetic