Tidy up CLI classes/modules