Format things a bit
Change the structure of user struct