Clean-up command-line options

* The `options` should be used instead of the `addOptions`;
* Small help strings clean-up.