Refactor clientEvents logic
Merge pull request #51 from patriciagarcia/clientEvents

Refactor clientEvents logic