Code refactoring + finished Get_Users fun