Format classes

Also fix User.