Improve Command class and add specs
Improve Client module wordings