Cleaned up web-client
Cleaned up client code