Refactoring and 1st round of user info saving