Updates in CLI tool

Signed-off-by: Vlad Velici <vlad.velici@gmail.com>
Small simplification of flag arguments.

Signed-off-by: Vlad Velici <vlad.velici@gmail.com>