cli: Code review in the CLI (Part 1.)
Can be reviewed by commit. More detail there.
Can be reviewed by commit. More detail there.
Fix small thing.
Can be reviewed by commit. More detail there.
Can be reviewed by commit. More detail there.
Fix small thing.