Refractor CLI to avoid repetition, e.g. helm group
Summary
/cc
@mlinhoff