Return to original cli library, cosmetic changes