Small simplification tweak
Added simple cli functionality