Fixing e refatoring Main cli.