(cleanup) Clean-up client-side code. Add comments.
Merge pull request #72 from lmle/feat/client

(cleanup) Clean-up client-side code. Add comments.