Chat users working, cleaned up code