Fix output formatting in CLI