Condensed code and made it neater

1. Removed unnecessary reassignment in Client.php: Not necessary to reassign same type and value null to null.

2. Make code look slightly neater in Model.php