[TASK] Cleanup CLI handling of CLI commands