Shifted CLI logic into separate class.
Minor doc tweaks.