Updating
Updating server class
Cleaning up pool class