cleaned up code
Merge pull request #39 from RichardAvendano/clientView

Cleaned up client side code