Clean up client side code
Merge pull request #88 from vreddy18/master

Clean up client side code