clean up the client and server code
README update