Revert "CLI: Minor fixes in various decriptions."

This reverts commit 440d08153aaecd62265fe6f7f961c1287d51a57f.