Fixed the Client and made it more Readable