Cleaned up server code
Vastly cleaned up client code