cleaned up the client a little