Add a docstring and return out of error case
Bring command choice into outermost if to allow command-specific help text