adding User.toJSON(users) and some beautification