Remove surname from user model
Fix user object
Code style