Code refactoring
[Client] Minor bug fix