Simplifying code

Drew Stinnettrequested to merge
cleanup-cli into main

Merge request reports