cleanup comments in cli/Output