Cleanup in the utils.
Adding unique client ids to each instance.
Cleaned up a few things.