Refactoring and Comments for Client Class
Some comments and refactoring. General.