Clean Up Code

- Copy back the function that show users' list