Add a better formatting for user model. #631