Cleaned up server/client relationship.  Made it more meaningful and compact.