some more refactor of the other commands

                       
| Q             | A   |
| ---           | --- |
| Bug fix?      | n   |
| New feature?  | n   |
| BC breaks?    | n   |
| Deprecations? | n   |
| Tests pass?   | y   |
| Fixed tickets | na  |
| License       | MIT |
| Doc PR        | na  |
                       

 Sent using [Gush](https://github.com/cordoval/gush)