Refactores: Client storage logic.

 - Issue: #6.