Update descriptions, clean up User model