Client Cleanup

Clean up of the code