Chnage SQL Schema
Show Displayname instead email
Remove unused TODO, unused code
Refactor Code