Finished updating users
Refactoring
Refactoring