clean up code and add USERS list example