cleaned up the AbstractBase of CLI some